From 110a57082b286c50edf4b28badbd670992dd4802 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 11 Jun 2025 15:29:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workmanagement/device/Aerocraft/index.vue | 72 +++++++++++ .../workmanagement/device/Aerocraft/utils.ts | 93 ++++++++++++++ .../device/Airport/DeviceBindModal/index.vue | 40 ++++++ .../FeedbackDrawer/Equipment/index.vue | 67 ++++++++++ .../Airport/FeedbackDrawer/Equipment/utils.ts | 95 ++++++++++++++ .../FeedbackDrawer/LogFeedback/index.vue | 67 ++++++++++ .../FeedbackDrawer/LogFeedback/utils.ts | 90 +++++++++++++ .../device/Airport/FeedbackDrawer/index.vue | 20 +++ .../workmanagement/device/Airport/index.vue | 101 +++++++++++++++ .../workmanagement/device/Airport/utils.ts | 119 ++++++++++++++++++ .../demo/workmanagement/device/index.vue | 30 +++++ 11 files changed, 794 insertions(+) create mode 100644 src/views/demo/workmanagement/device/Aerocraft/index.vue create mode 100644 src/views/demo/workmanagement/device/Aerocraft/utils.ts create mode 100644 src/views/demo/workmanagement/device/Airport/DeviceBindModal/index.vue create mode 100644 src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/index.vue create mode 100644 src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/utils.ts create mode 100644 src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/index.vue create mode 100644 src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/utils.ts create mode 100644 src/views/demo/workmanagement/device/Airport/FeedbackDrawer/index.vue create mode 100644 src/views/demo/workmanagement/device/Airport/index.vue create mode 100644 src/views/demo/workmanagement/device/Airport/utils.ts create mode 100644 src/views/demo/workmanagement/device/index.vue diff --git a/src/views/demo/workmanagement/device/Aerocraft/index.vue b/src/views/demo/workmanagement/device/Aerocraft/index.vue new file mode 100644 index 0000000..af0f556 --- /dev/null +++ b/src/views/demo/workmanagement/device/Aerocraft/index.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/demo/workmanagement/device/Aerocraft/utils.ts b/src/views/demo/workmanagement/device/Aerocraft/utils.ts new file mode 100644 index 0000000..589ed80 --- /dev/null +++ b/src/views/demo/workmanagement/device/Aerocraft/utils.ts @@ -0,0 +1,93 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +export const columns = [ + { + title: '设备型号', + dataIndex: 'model', + }, + { + title: '设备SN', + dataIndex: 'sn', + }, + { + title: '设备名称', + dataIndex: 'name', + }, + { + title: '固件版本', + dataIndex: 'version', + }, + { + title: '在线状态', + dataIndex: 'status', + }, + { + title: '所属项目', + dataIndex: 'project', + }, + { + title: '加入组织时间', + dataIndex: 'join_time', + }, + { + title: '在线时间', + dataIndex: 'online_time', + }, +]; +export const dataSource = [ + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, +] +export const searchFormSchema: FormSchema[] = [ + { + field: 'project', + label: '项目', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'status', + label: '当前状态', + component: 'Select', + componentProps: { + options: [ + { label: '在线', value: '在线' }, + { label: '离线', value: '离线' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'model', + label: '设备型号', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'sn', + label: '设备SN', + component: 'Input', + colProps: { span: 6 }, + }, +]; \ No newline at end of file diff --git a/src/views/demo/workmanagement/device/Airport/DeviceBindModal/index.vue b/src/views/demo/workmanagement/device/Airport/DeviceBindModal/index.vue new file mode 100644 index 0000000..c836cca --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/DeviceBindModal/index.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/index.vue b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/index.vue new file mode 100644 index 0000000..b647f08 --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/index.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/utils.ts b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/utils.ts new file mode 100644 index 0000000..2b44112 --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/Equipment/utils.ts @@ -0,0 +1,95 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +export const columns = [ + { + title: '操作时间', + dataIndex: 'operate_time', + }, + { + title: '定损类型', + dataIndex: 'problem_type', + }, + { + title: '操作人', + dataIndex: 'user', + }, + { + title: '设备型号', + dataIndex: 'model', + }, + { + title: '设备SN', + dataIndex: 'sn', + }, + { + title: '设备名称', + dataIndex: 'name', + }, + { + title: '状态', + dataIndex: 'status', + }, +]; +export const dataSource = [ + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, + { operate_time: 111, problem_type:222, user: 333, model: 444, sn:'1.0.0', name:'test', status: 555}, +] +export const searchFormSchema: FormSchema[] = [ + { + field: 'time', + component: 'RangePicker', + colProps: { span: 4 }, + }, + { + field: 'type', + label: '定损类型', + component: 'Select', + componentProps: { + options: [ + { label: '整机定损', value: '整机定损' }, + { label: '空调制冷模块定损', value: '空调制冷模块定损' }, + { label: '空调制热模块定损', value: '空调制热模块定损' }, + { label: '快速定损', value: '快速定损' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'user', + label: '操作员', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'status', + label: '状态', + component: 'Select', + componentProps: { + options: [ + { label: '待上传', value: '待上传' }, + { label: '数据处理', value: '数据处理' }, + { label: '上传中', value: '上传中' }, + { label: '上传完成', value: '上传完成' }, + { label: '上传失败', value: '上传失败' }, + { label: '已暂停', value: '已暂停' }, + { label: '已取消', value: '已取消' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'sn', + label: '设备SN', + component: 'Input', + colProps: { span: 6 }, + }, +]; \ No newline at end of file diff --git a/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/index.vue b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/index.vue new file mode 100644 index 0000000..4b7cedc --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/index.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/utils.ts b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/utils.ts new file mode 100644 index 0000000..a3fa020 --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/LogFeedback/utils.ts @@ -0,0 +1,90 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +export const columns = [ + { + title: '反馈时间', + dataIndex: 'feedback_time', + }, + { + title: '反馈人', + dataIndex: 'feedback_user', + }, + { + title: '设备型号', + dataIndex: 'model', + }, + { + title: '设备SN', + dataIndex: 'sn', + }, + { + title: '设备名称', + dataIndex: 'name', + }, + { + title: '设备异常描述', + dataIndex: 'description', + }, + { + title: '上传状态', + dataIndex: 'status', + }, +]; +export const dataSource = [ + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, + { feedback_time: 111, feedback_user:222, model: 333, sn: 444, name:'1.0.0', description:'test', status: 555}, +] +export const searchFormSchema: FormSchema[] = [ + { + field: 'time', + component: 'RangePicker', + // componentProps: { + // options: [ + // { label: '固件待升级', value: '固件待升级' }, + // { label: '固件一致性升级', value: '固件一致性升级' }, + // { label: '飞行安全数据库待升级', value: '飞行安全数据库待升级' }, + // ], + // }, + colProps: { span: 4 }, + }, + { + field: 'feedback_user', + label: '反馈人', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'status', + label: '状态', + component: 'Select', + componentProps: { + options: [ + { label: '待上传', value: '待上传' }, + { label: '数据处理', value: '数据处理' }, + { label: '上传中', value: '上传中' }, + { label: '上传完成', value: '上传完成' }, + { label: '上传失败', value: '上传失败' }, + { label: '已暂停', value: '已暂停' }, + { label: '已取消', value: '已取消' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'sn', + label: '设备SN', + component: 'Input', + colProps: { span: 6 }, + }, +]; \ No newline at end of file diff --git a/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/index.vue b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/index.vue new file mode 100644 index 0000000..3efe975 --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/FeedbackDrawer/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/demo/workmanagement/device/Airport/index.vue b/src/views/demo/workmanagement/device/Airport/index.vue new file mode 100644 index 0000000..defc52f --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/index.vue @@ -0,0 +1,101 @@ + + + + + +// diff --git a/src/views/demo/workmanagement/device/Airport/utils.ts b/src/views/demo/workmanagement/device/Airport/utils.ts new file mode 100644 index 0000000..e68a4d7 --- /dev/null +++ b/src/views/demo/workmanagement/device/Airport/utils.ts @@ -0,0 +1,119 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +export const columns = [ + { + title: '设备型号', + dataIndex: 'model', + }, + { + title: '设备SN', + dataIndex: 'sn', + }, + { + title: '设备名称', + dataIndex: 'name', + }, + { + title: '固件版本', + dataIndex: 'version', + }, + { + title: '固件升级', + dataIndex: 'upgrade', + }, + { + title: '飞行安全数据库', + dataIndex: 'database', + }, + { + title: '工作状态', + dataIndex: 'status', + }, + { + title: '所属项目', + dataIndex: 'project', + }, + { + title: '加入组织时间', + dataIndex: 'join_time', + }, + { + title: '在线时间', + dataIndex: 'online_time', + }, +]; +export const dataSource = [ + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, + { model: 111, sn:222, name: 333, version: 444, upgrade:'1.0.0', database:'test', status: 555, project: 666, join_time: 777, online_time: 888 }, +] +export const searchFormSchema: FormSchema[] = [ + { + field: 'upgrade_status', + label: '升级状态', + component: 'Select', + componentProps: { + options: [ + { label: '固件待升级', value: '固件待升级' }, + { label: '固件一致性升级', value: '固件一致性升级' }, + { label: '飞行安全数据库待升级', value: '飞行安全数据库待升级' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'work_status', + label: '工作状态', + component: 'Select', + componentProps: { + options: [ + { label: '全部工作状态', value: '全部工作状态' }, + { label: '设备空闲中', value: '设备空闲中' }, + { label: '现场调试中', value: '现场调试中' }, + { label: '远程调试中', value: '远程调试中' }, + { label: '设备作业中', value: '设备作业中' }, + { label: '设备升级中', value: '设备升级中' }, + { label: '设备已离线', value: '设备已离线' }, + { label: '未标定', value: '未标定' }, + ], + }, + colProps: { span: 4 }, + }, + { + field: 'project', + label: '项目', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'model', + label: '设备型号', + component: 'Select', + componentProps: { + options: [ + ], + }, + colProps: { span: 4 }, + }, + { + field: 'sn', + label: '设备SN', + component: 'Input', + colProps: { span: 6 }, + }, +]; \ No newline at end of file diff --git a/src/views/demo/workmanagement/device/index.vue b/src/views/demo/workmanagement/device/index.vue new file mode 100644 index 0000000..0f57ae3 --- /dev/null +++ b/src/views/demo/workmanagement/device/index.vue @@ -0,0 +1,30 @@ + + + + + From be56bbf0fcc79516d17e10a7ae789a20d7260611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Thu, 12 Jun 2025 15:07:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93-=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 +- src/components/MapboxMaps/src/config.ts | 2 +- src/views/demo/system/mediaLibrary/index.vue | 279 +++++++----- .../demo/system/mediaLibrary/preview/Map.vue | 332 ++++---------- .../system/mediaLibrary/preview/preview.vue | 8 +- .../mediaLibrary/preview/previewImage.vue | 4 +- .../preview/previewInformation.vue | 2 +- .../mediaLibrary/preview/previewVideo.vue | 1 + .../mediaLibrary/priview2D3D/model2D.vue | 428 ++++++++++++++++++ .../mediaLibrary/priview2D3D/model3D.vue | 126 ++++++ .../mediaLibrary/priview2D3D/modelModal.vue | 264 +++++++++++ .../mediaLibrary/priview2D3D/preview.ts | 10 - .../mediaLibrary/priview2D3D/preview.vue | 5 - 13 files changed, 1083 insertions(+), 390 deletions(-) create mode 100644 src/views/demo/system/mediaLibrary/priview2D3D/model2D.vue create mode 100644 src/views/demo/system/mediaLibrary/priview2D3D/model3D.vue create mode 100644 src/views/demo/system/mediaLibrary/priview2D3D/modelModal.vue delete mode 100644 src/views/demo/system/mediaLibrary/priview2D3D/preview.ts delete mode 100644 src/views/demo/system/mediaLibrary/priview2D3D/preview.vue diff --git a/package.json b/package.json index 8b8f1a1..6ea9c50 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "bpmn-js-properties-panel": "^5.13.0", "bpmn-js-token-simulation": "^0.33.1", "ceel-json-editor": "^0.0.3", + "cesium": "^1.130.0", "codemirror": "^5.65.16", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", @@ -99,10 +100,14 @@ "driver.js": "^1.3.1", "echarts": "^5.4.3", "element-plus": "^2.6.0", + "esbuild": "^0.19.12", "exceljs": "^4.4.0", "fabric": "^4.6.0", "highlight.js": "^11.9.0", + "js-base64": "3.7.7", "js-md5": "^0.8.3", + "jsencrypt": "^3.3.2", + "jszip": "^3.10.1", "kml-geojson": "^1.2.2", "localforage": "^1.10.0", "lodash": "^4.17.21", @@ -126,6 +131,7 @@ "qs": "^6.11.2", "resize-observer-polyfill": "^1.5.1", "showdown": "^2.1.0", + "shpjs": "^6.1.0", "sortablejs": "^1.15.1", "terraformer-wkt-parser": "^1.2.1", "three": "^0.145.0", @@ -134,6 +140,7 @@ "uuid": "^9.0.1", "vditor": "^3.9.8", "video.js": "^8.6.1", + "vite-plugin-cesium": "^1.2.23", "vue": "3.3.4", "vue-color-kit": "^1.0.6", "vue-i18n": "^9.8.0", @@ -148,10 +155,7 @@ "vxe-table-plugin-export-xlsx": "^3.1.0", "xe-utils": "^3.5.14", "xlsx": "^0.18.5", - "xml-js": "^1.6.11", - "jszip":"^3.10.1", - "shpjs":"^6.1.0", - "js-base64":"3.7.7" + "xml-js": "^1.6.11" }, "devDependencies": { "@commitlint/cli": "^18.4.4", diff --git a/src/components/MapboxMaps/src/config.ts b/src/components/MapboxMaps/src/config.ts index 00eb631..4119bfa 100644 --- a/src/components/MapboxMaps/src/config.ts +++ b/src/components/MapboxMaps/src/config.ts @@ -1,5 +1,5 @@ export enum MapboxConfig { - ACCESS_TOKEN = 'pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q', + ACCESS_TOKEN = 'pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw', // ACCESS_TOKEN = "1234", TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9', // add more config options here diff --git a/src/views/demo/system/mediaLibrary/index.vue b/src/views/demo/system/mediaLibrary/index.vue index 2186830..080ab6b 100644 --- a/src/views/demo/system/mediaLibrary/index.vue +++ b/src/views/demo/system/mediaLibrary/index.vue @@ -59,6 +59,15 @@ @ok="handleOk" > + { - // console.log(selectedRowKeys, selectedRows); - // }, - // onSelect: (record, selected, selectedRows) => { - // console.log(record, selected, selectedRows); - // }, - // onSelectAll: (selected, selectedRows, changeRows) => { - // console.log(selected, selectedRows, changeRows); - // }, }, striped: false, bordered: false, diff --git a/src/views/demo/system/mediaLibrary/preview/Map.vue b/src/views/demo/system/mediaLibrary/preview/Map.vue index 827fed7..926f38d 100644 --- a/src/views/demo/system/mediaLibrary/preview/Map.vue +++ b/src/views/demo/system/mediaLibrary/preview/Map.vue @@ -1,261 +1,97 @@ - + + diff --git a/src/views/demo/system/mediaLibrary/preview/preview.vue b/src/views/demo/system/mediaLibrary/preview/preview.vue index 964dcf8..be9b2ed 100644 --- a/src/views/demo/system/mediaLibrary/preview/preview.vue +++ b/src/views/demo/system/mediaLibrary/preview/preview.vue @@ -59,6 +59,8 @@ const props = defineProps(['nowPreviewRecord', 'previewRecordList']); const emit = defineEmits(['closeModal', 'chooseNowPreviewRecord', 'reloadTable']); + console.log(props.nowPreviewRecord); + // 选择 function chooseNowPreviewRecord(value) { emit('chooseNowPreviewRecord', value); @@ -75,7 +77,7 @@ diff --git a/src/views/demo/system/mediaLibrary/preview/previewVideo.vue b/src/views/demo/system/mediaLibrary/preview/previewVideo.vue index efc43b0..f812e1a 100644 --- a/src/views/demo/system/mediaLibrary/preview/previewVideo.vue +++ b/src/views/demo/system/mediaLibrary/preview/previewVideo.vue @@ -41,5 +41,6 @@ import { MonitorQX } from './preview'; const props = defineProps(['nowPreviewRecord']); + console.log(props.nowPreviewRecord); diff --git a/src/views/demo/system/mediaLibrary/priview2D3D/model2D.vue b/src/views/demo/system/mediaLibrary/priview2D3D/model2D.vue new file mode 100644 index 0000000..1f3b9fa --- /dev/null +++ b/src/views/demo/system/mediaLibrary/priview2D3D/model2D.vue @@ -0,0 +1,428 @@ + + + + + diff --git a/src/views/demo/system/mediaLibrary/priview2D3D/model3D.vue b/src/views/demo/system/mediaLibrary/priview2D3D/model3D.vue new file mode 100644 index 0000000..223129b --- /dev/null +++ b/src/views/demo/system/mediaLibrary/priview2D3D/model3D.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/demo/system/mediaLibrary/priview2D3D/modelModal.vue b/src/views/demo/system/mediaLibrary/priview2D3D/modelModal.vue new file mode 100644 index 0000000..4f5bea3 --- /dev/null +++ b/src/views/demo/system/mediaLibrary/priview2D3D/modelModal.vue @@ -0,0 +1,264 @@ + + + diff --git a/src/views/demo/system/mediaLibrary/priview2D3D/preview.ts b/src/views/demo/system/mediaLibrary/priview2D3D/preview.ts deleted file mode 100644 index 6e8bf83..0000000 --- a/src/views/demo/system/mediaLibrary/priview2D3D/preview.ts +++ /dev/null @@ -1,10 +0,0 @@ -// export { default as PreviewImage } from './previewImage.vue'; -// export { default as PreviewCanvas } from './previewCanvas.vue'; -// export { default as PreviewVideo } from './previewVideo.vue'; -// export { default as PreviewInformation } from './previewInformation.vue'; -// export { default as MonitorHK } from './video/monitorHK.vue'; -// export { default as MonitorLC } from './video/monitorLC.vue'; -// export { default as MonitorQX } from './video/monitorQX.vue'; -// export { default as MonitorTX } from './video/monitorTX.vue'; -// export { default as PanoViewer } from './PanoViewer.vue'; -// export { default as Map } from './Map.vue'; \ No newline at end of file diff --git a/src/views/demo/system/mediaLibrary/priview2D3D/preview.vue b/src/views/demo/system/mediaLibrary/priview2D3D/preview.vue deleted file mode 100644 index d8bf32d..0000000 --- a/src/views/demo/system/mediaLibrary/priview2D3D/preview.vue +++ /dev/null @@ -1,5 +0,0 @@ - - -