From 5f68826986e17f7b052c0ebe12f540d4b9c08f5f Mon Sep 17 00:00:00 2001 From: liaoboping <344114999@qq.com> Date: Tue, 9 Sep 2025 16:58:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=86=9B=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 6 +- src/components/Common/Form/IconSelector.vue | 13 + src/components/Common/Form/Image2Base64.vue | 1 + src/components/Common/register.js | 2 + .../database/components/EditIcon.vue | 24 + src/views/simulationScene/database/txsjk.vue | 4 +- src/views/simulationScene/database/zbsjk.vue | 44 +- .../sceneEditing/components/SceneEditing.vue | 201 +++++ .../simulationScene/sceneEditing/index.vue | 839 +----------------- src/views/simulationScene/trainer/index.vue | 34 +- 10 files changed, 370 insertions(+), 798 deletions(-) create mode 100644 src/components/Common/Form/IconSelector.vue create mode 100644 src/views/simulationScene/database/components/EditIcon.vue create mode 100644 src/views/simulationScene/sceneEditing/components/SceneEditing.vue diff --git a/src/App.vue b/src/App.vue index 6d31302..cea493d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -110,13 +110,13 @@ export default { .jc-fe { justify-content: flex-end; } -.fr-w { +.fw-w { flex-wrap: wrap; } -.fr-n { +.fw-n { flex-wrap: nowrap; } -.fr-wr { +.fw-wr { flex-wrap: wrap-reverse; } diff --git a/src/components/Common/Form/IconSelector.vue b/src/components/Common/Form/IconSelector.vue new file mode 100644 index 0000000..a552f81 --- /dev/null +++ b/src/components/Common/Form/IconSelector.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components/Common/Form/Image2Base64.vue b/src/components/Common/Form/Image2Base64.vue index 3867b56..c229bd8 100644 --- a/src/components/Common/Form/Image2Base64.vue +++ b/src/components/Common/Form/Image2Base64.vue @@ -38,6 +38,7 @@ export default { reader.readAsDataURL(file) reader.onload = (e) => { this.imageSrc = e.target.result + this.$emit('change', e.target.result, file) } }, }, diff --git a/src/components/Common/register.js b/src/components/Common/register.js index 0a85a73..d8586c2 100644 --- a/src/components/Common/register.js +++ b/src/components/Common/register.js @@ -8,6 +8,7 @@ import AntOriginSelect from './Form/AntOriginSelect.vue' import AntOriginTreeSelect from './Form/AntOriginTreeSelect.vue' import DurationPicker from './Form/DurationPicker.vue' import Image2Base64 from './Form/Image2Base64.vue' +import IconSelector from './Form/IconSelector.vue' import WangEditor from './WangEditor/Index.vue' @@ -30,6 +31,7 @@ export default { Vue.component('AntOriginTreeSelect', AntOriginTreeSelect) Vue.component('DurationPicker', DurationPicker) Vue.component('Image2Base64', Image2Base64) + Vue.component('IconSelector', IconSelector) Vue.component('WangEditor', WangEditor) diff --git a/src/views/simulationScene/database/components/EditIcon.vue b/src/views/simulationScene/database/components/EditIcon.vue new file mode 100644 index 0000000..2153fcb --- /dev/null +++ b/src/views/simulationScene/database/components/EditIcon.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/simulationScene/database/txsjk.vue b/src/views/simulationScene/database/txsjk.vue index 23149d2..270c374 100644 --- a/src/views/simulationScene/database/txsjk.vue +++ b/src/views/simulationScene/database/txsjk.vue @@ -50,7 +50,7 @@ export default { columns: [ { dataIndex: 'serial' }, { dataIndex: 'iconName', title: '军标名称', width: 'auto', align: 'center' }, - { dataIndex: 'iconBase64', title: '军标路径', width: 'auto', align: 'center' }, + { dataIndex: 'iconBase64', title: '军标图片', width: 'auto', align: 'center' }, { dataIndex: 'action' }, ], }, @@ -62,7 +62,7 @@ export default { title: '新增图形', formItems: [ { label: '军标名称', prop: 'iconName' }, - { label: '军标路径', prop: 'iconBase64', component: 'Image2Base64' }, + { label: '军标图片', prop: 'iconBase64', component: 'Image2Base64' }, ], formRules: {}, formData: {}, diff --git a/src/views/simulationScene/database/zbsjk.vue b/src/views/simulationScene/database/zbsjk.vue index 9dabb9e..91e35bf 100644 --- a/src/views/simulationScene/database/zbsjk.vue +++ b/src/views/simulationScene/database/zbsjk.vue @@ -19,7 +19,7 @@ >