yuliang
/
yvan-rcs-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
liupeng 7 months ago
parent
7964889b32 5710b882ca
commit
063a44a597
3 changed files with 70 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/runtime/DefineWidget.ts
  2. 52
      src/views/ModelMain.vue
  3. 59
      src/views/modeleditor/ModelEditor.vue

2
src/runtime/DefineWidget.ts
View File

@ -31,7 +31,7 @@ export class WidgetInfo {
console.log(`Widget ${this.option.name} already exists`)
return
}
_widgetMap.set(this.option.name, markRaw(this.option))
_widgetMap.set(this.option.name, this.option)
}
}

52
src/views/ModelMain.vue
View File

@ -59,48 +59,15 @@
</SplitArea>
<SplitArea class="section-center" :class="{'hidden-split':hideRight}" :size="calcCenterSize">
<el-tabs type="card" class="section-tabs">
<el-tab-pane label="标签1">
<div class="section-canvas">
<div class="section-top-toolbar section-toolbar">
<el-button type="primary" :icon="renderIcon('element TopLeft')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element TopRight')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('icon5 Resize')" link>尺寸</el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd SwitcherOutlined')" link>图层</el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element Setting')" link>设置</el-button>
</div>
<div class="section-content"></div>
<div class="section-bottom-toolbar section-toolbar">
<div class="section-toolbar-left">
<el-button type="primary" :icon="renderIcon('fa MousePointer')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element Aim')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd LineOutlined')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('icon5 BandageSharp')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd InsertRowLeftOutlined')" link></el-button>
</div>
<div class="section-toolbar-right">
<el-button type="primary" size="small" round>清空选择</el-button>
<div class="infor">
X=14.091,Y=12.397
</div>
</div>
</div>
</div>
<el-tab-pane label="模型属性" lazy>
<el-empty description="暂无数据" />
</el-tab-pane>
<el-tab-pane label="3D编辑器" name="ModelEditor" lazy>
<ModelEditor />
</el-tab-pane>
<el-tab-pane label="基础资料" lazy>
<el-empty description="暂无数据" />
</el-tab-pane>
<el-tab-pane label="标签2">标签2</el-tab-pane>
<el-tab-pane label="标签3">标签3</el-tab-pane>
<el-tab-pane label="标签4">标签4</el-tab-pane>
<el-tab-pane label="标签5">标签5</el-tab-pane>
<el-tab-pane label="标签6">标签6</el-tab-pane>
<el-tab-pane label="标签7">标签7</el-tab-pane>
<el-tab-pane label="标签8">标签8</el-tab-pane>
</el-tabs>
</SplitArea>
<SplitArea v-show="!hideRight" class="section-right" :size="hideRight ? 0 : sectionRightSize">
@ -166,11 +133,12 @@ import './ModelMain.less'
import ModelMainInit from '@/views/ModelMainInit.js'
import { getRootMenu } from '@/runtime/DefineMenu.js'
import { getWidgetByName, getWidgetBySide } from '@/runtime/DefineWidget.js'
import ModelEditor from '@/views/modeleditor/ModelEditor.vue'
ModelMainInit()
export default {
components: { Split, SplitArea },
components: { ModelEditor, Split, SplitArea },
mounted() {
},
data() {

59
src/views/modeleditor/ModelEditor.vue
View File

@ -0,0 +1,59 @@
<template>
<div class="section-canvas">
<div class="section-top-toolbar section-toolbar">
<el-button type="primary" :icon="renderIcon('element TopLeft')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element TopRight')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('icon5 Resize')" link>尺寸</el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd SwitcherOutlined')" link>图层</el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element Setting')" link>设置</el-button>
</div>
<div class="section-content"></div>
<div class="section-bottom-toolbar section-toolbar">
<div class="section-toolbar-left">
<el-button type="primary" :icon="renderIcon('fa MousePointer')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('element Aim')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd LineOutlined')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('icon5 BandageSharp')" link></el-button>
<span class="section-toolbar-line"></span>
<el-button type="primary" :icon="renderIcon('antd InsertRowLeftOutlined')" link></el-button>
</div>
<div class="section-toolbar-right">
<el-button type="primary" size="small" round>清空选择</el-button>
<div class="infor">
X=14.091,Y=12.397
</div>
</div>
</div>
</div>
</template>
<script>
import { renderIcon } from '@/utils/webutils.ts'
export default {
name: 'ModelEditor',
components: {
renderIcon
},
data() {
return {
sectionLeftSearch: '',
sectionRightSize: 0,
sectionBottomSize: 0,
hideRight: false,
hideBottom: false,
calcRightPanel: null,
calcBottomPanel: null
}
},
methods: {
renderIcon
}
}
</script>
Write Preview
Loading…
Cancel
Save