diff --git a/public/models/default/default.glb b/public/models/default/default.glb new file mode 100644 index 0000000..b48b0b9 Binary files /dev/null and b/public/models/default/default.glb differ diff --git a/src/App.vue b/src/App.vue index aac5f7f..6b72596 100644 --- a/src/App.vue +++ b/src/App.vue @@ -62,8 +62,11 @@ import VueThreeBuilding from '@/components/three-components/vue-three-building.v import VueExtinguisherTable from '@/components/vue-components/vue-extinguisher-table.vue'; import VueIlluminationTable from '@/components/vue-components/vue-illumination-table.vue'; import VueStrInfo from '@/components/vue-components/vue-str-info.vue'; -// src\components\vue-components\vue-test-controller.vue import VueTestController from '@/components/vue-components/vue-test-controller.vue'; +import VueCar from '@/components/vue-components/vue-car.vue'; +import VueBaseInformation from '@/components/vue-components/vue-base-information.vue'; +// F:\vue\workspace\maotu-webtopo\src\components\vue-components\vue-3d-base-information.vue +import Vue3dBaseInformation from '@/components/vue-components/vue-3d-base-information.vue'; // 图表 import VueGradeGauge from '@/components/vue-components/echarts-grade-gauge.vue'; @@ -120,6 +123,9 @@ instance?.appContext.app.component('vue-my-extinguisher-table', VueExtinguisherT instance?.appContext.app.component('vue-my-illumination-table', VueIlluminationTable); instance?.appContext.app.component('vue-my-str-info', VueStrInfo); instance?.appContext.app.component('vue-my-test-controller', VueTestController); +instance?.appContext.app.component('vue-my-car', VueCar); +instance?.appContext.app.component('vue-my-base-information', VueBaseInformation); +instance?.appContext.app.component('vue-my-3d-base-information', Vue3dBaseInformation); instance?.appContext.app.component('vue-grade-gauge', VueGradeGauge); instance?.appContext.app.component('vue-guage-line-chart', VueGuageLineChart); @@ -448,8 +454,18 @@ leftAsideStore.registerConfig('vue公共组件', [ }, testColor: { type: 'color', - val: '#44B6E7', + val: '#ffffff', title: '文字颜色' + }, + fontSize: { + type: 'number', + val: 16, + title: '字体大小' + }, + fontBold: { + type: 'switch', + val: false, + title: '加粗' } } }, @@ -721,6 +737,97 @@ leftAsideStore.registerConfig('vue公共组件', [ ] } } + }, + { + id: 'vue-my-car', + title: 'vue卡片组件', + type: 'vue', + thumbnail: '/svgs/table-base.svg', + props: { + fontFamily: { + title: '字体', + type: 'select', + val: 'Segoe UI', + options: [ + { + value: 'Segoe UI', + label: 'Segoe UI' + }, + { + value: '微软雅黑', + label: '微软雅黑' + }, + { + value: '黑体', + label: '黑体' + }, + { + value: '宋体', + label: '宋体' + } + ] + }, + testContent: { + type: 'input', + val: '标题内容', + title: '标题内容' + }, + fontSize: { + type: 'number', + val: 14, + title: '标题大小' + }, + testColor: { + type: 'color', + val: '#ffffff', + title: '文字颜色' + }, + skeletonBool: { + type: 'switch', + val: false, + title: '辅助框' + }, + skeletonRows: { + type: 'number', + val: 3, + title: '框数量' + } + } + }, + { + id: 'vue-my-base-information', + title: 'vue基本信息', + type: 'vue', + thumbnail: '/svgs/table-base.svg', + props: { + dataSource: { + title: '数据源', + type: 'select', + val: '--', + options: [ + { + value: 'fireAlarmHost', + label: '火灾报警系统主机' + }, + { + value: 'host', + label: '主机' + }, + { + value: 'oilChromatography', + label: '2号主变油色谱' + }, + { + value: 'partialDischarge', + label: '2号主变局放' + }, + { + value: 'switchGap', + label: '2215开关间隔' + } + ] + } + } } ]); @@ -957,6 +1064,54 @@ leftAsideStore.registerConfig('vue3D组件', [ val: '--' } } + }, + { + id: 'vue-my-3d-base-information', + title: '3d-基本信息', + type: 'vue', + thumbnail: '/svgs/table-only.svg', + props: { + dataTitle: { + title: '标题', + type: 'input', + val: '单个设备基本信息' + }, + dataSource: { + title: '数据源', + type: 'select', + val: '--', + options: [ + { + value: 'smokeSiren', + label: '烟感报警器' + }, + { + value: 'temperatureFireDetector', + label: '温感火灾探测器' + }, + { + value: 'fireHydrant', + label: '消火栓' + }, + { + value: 'fireExtinguisher', + label: '灭火器' + }, + { + value: 'evacuationSign', + label: '疏散指示灯' + }, + { + value: 'infraredBeam', + label: '红外对射' + }, + { + value: 'accessController', + label: '门禁控制器' + } + ] + } + } } ]); diff --git a/src/assets.zip b/src/assets.zip deleted file mode 100644 index 18eda4d..0000000 Binary files a/src/assets.zip and /dev/null differ diff --git a/src/components/mt-edit/components/layout/header-panel/index.vue b/src/components/mt-edit/components/layout/header-panel/index.vue index b1a03d2..c02e91b 100644 --- a/src/components/mt-edit/components/layout/header-panel/index.vue +++ b/src/components/mt-edit/components/layout/header-panel/index.vue @@ -73,8 +73,8 @@ - - + @@ -332,6 +332,11 @@ const headerPanelProps = withDefaults(defineProps(), { useThumbnail: false, selectedItemsId: () => [] }); + +function leftJustify() { + emits('alignSelected', 'left'); +} + const emits = defineEmits([ 'update:leftAside', 'update:rightAside', diff --git a/src/components/mt-edit/components/layout/main-panel/index.vue b/src/components/mt-edit/components/layout/main-panel/index.vue index ec3b031..f7bbfe8 100644 --- a/src/components/mt-edit/components/layout/main-panel/index.vue +++ b/src/components/mt-edit/components/layout/main-panel/index.vue @@ -348,6 +348,7 @@ const onRenderCoreMouseDown = (item: IDoneJson, e: MouseEvent) => { globalStore.refreshSelectedItemsId(); } }; + const onMouseDown = (e: MouseEvent) => { beginListenerKeyDown(); globalStore.cancelAllSelect(); @@ -376,6 +377,7 @@ const onMouseDown = (e: MouseEvent) => { globalStore.setIntention('beginMulSelect'); selectedAreaRef.value?.onMouseDown(e); }; + /** * 区域选择结束事件 之所以用getBoundingClientRect是为了处理旋转后的坐标 * @param area_binfo 区域选择的边界信息 diff --git a/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue b/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue index e78cbdb..bf9f2ce 100644 --- a/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue +++ b/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue @@ -441,7 +441,7 @@ const props2 = { }; async function getDataSource() { - debugger + debugger; let cls = '-1'; if (selectedPartition.value && selectedPartition.value.length > 0) cls = selectedPartition.value[selectedPartition.value.length - 1]; @@ -458,19 +458,19 @@ async function getDataSource() { gridData.value.splice(0, gridData.value.length); response.data.forEach((item: any) => { console.log('item:', item); - gridDataSource.value.push({ + gridDataSource.value.push({ + modeId: item.id, + name: item.name, + bType: item.btype + }); + + if (code == undefined || code == item.btype) { + gridData.value.push({ modeId: item.id, name: item.name, bType: item.btype }); - - if (code == undefined || code == item.btype) { - gridData.value.push({ - modeId: item.id, - name: item.name, - bType: item.btype - }); - } + } }); ElMessage.success('接口请求成功'); diff --git a/src/components/my-test.vue b/src/components/my-test.vue index 5233603..c77db8b 100644 --- a/src/components/my-test.vue +++ b/src/components/my-test.vue @@ -1,20 +1,50 @@ diff --git a/src/components/public-compoents/node-list-dialog.vue b/src/components/public-compoents/node-list-dialog.vue new file mode 100644 index 0000000..4db24d8 --- /dev/null +++ b/src/components/public-compoents/node-list-dialog.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/components/vue-components/vue-3d-base-information.vue b/src/components/vue-components/vue-3d-base-information.vue new file mode 100644 index 0000000..e1a942d --- /dev/null +++ b/src/components/vue-components/vue-3d-base-information.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/components/vue-components/vue-base-information.vue b/src/components/vue-components/vue-base-information.vue new file mode 100644 index 0000000..f48a749 --- /dev/null +++ b/src/components/vue-components/vue-base-information.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/vue-components/vue-car.vue b/src/components/vue-components/vue-car.vue new file mode 100644 index 0000000..7e38522 --- /dev/null +++ b/src/components/vue-components/vue-car.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/components/vue-components/vue-str-info.vue b/src/components/vue-components/vue-str-info.vue index f53957b..4533aa2 100644 --- a/src/components/vue-components/vue-str-info.vue +++ b/src/components/vue-components/vue-str-info.vue @@ -1,6 +1,6 @@