@@ -33,12 +37,27 @@
/>
- {{ item.fileName }}
+ {{ item.name }}
{{ item.createdAt }}
-
+ 已启用
+
+
+ 启用
+
+
删除
@@ -122,10 +141,15 @@
@@ -226,6 +314,7 @@ const handleError = (error: Error) => {
box-sizing: border-box;
display: flex;
line-height: 32px; // padding: 20px 0;
+ padding: 0 0 20px 0;
.fankuai {
width: 10px;
height: 10px;
@@ -267,9 +356,10 @@ const handleError = (error: Error) => {
}
.fileList {
width: 100%;
- height: 20vh;
+ // height: 20vh;
+ max-height: 20vh;
box-sizing: border-box;
- padding: 20px 0;
+ padding: 0 0 20px 0;
.fileList_nav {
width: 100%;
diff --git a/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue
index 77d3de5..2de41bd 100644
--- a/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue
@@ -37,6 +37,8 @@
draggable
ref="treeRef"
node-key="id"
+ empty-text=""
+ :default-expanded-keys="expandedKeys"
@node-click="handleTypeClick"
@node-contextmenu="handleContextMenu"
@node-drag-start="handleDragStart"
@@ -79,11 +81,15 @@
-
+
+
@@ -145,6 +151,7 @@ import {
const fs = require('fs')
const eventBus: any = inject('bus')
var clickTreeNode: any = reactive({})
+var leftClickTreeNode: any = reactive({})
interface TypeNode {
id: string
@@ -159,8 +166,8 @@ interface ModelItem {
id: string
typeId: string
name: string
- thumbnail: string
militaryId: string
+ militaryDataUrl: string
}
const typeTreeData = ref([])
@@ -225,12 +232,26 @@ const addType = () => {
dialogVisible.value = false
}
+var expandedKeys: any = ref([])
+// 获取当前所有展开节点的key
+const getExpandedKeys = () => {
+ const nodesMap = treeRef.value?.store?.nodesMap || {}
+ return Object.values(nodesMap)
+ .filter((node) => node.expanded)
+ .map((node) => node.key)
+}
+
+// 节点展开/折叠时更新状态
+const updateExpandedState = () => {
+ const keys = getExpandedKeys()
+ expandedKeys.value = keys
+}
+
//获取模型列表
eventBus.on('settingPop', (data) => {
if (data) {
//关闭弹框时更新模型列表
- // getModelList()
- getModelListByType(showImageRow.militaryTypeId)
+ // getModelListByType(showImageRow.militaryTypeId)
showImageRow = null
}
})
@@ -321,10 +342,11 @@ const importModelDB = () => {
const addModelDB = (path) => {
let formData = new FormData()
- formData.append('modelPath', path)
+ formData.append('militaryPath', path)
GraphApi.importModelDB(formData).then((res) => {
if (res.code == 0 || res.code == 200) {
ElMessage.success('导入成功')
+ modelList.value = []
getModelList()
}
})
@@ -352,6 +374,19 @@ const handleDragEnd = (
ev: DragEvents
) => {
console.log('tree drag end:', dropNode, dropType, ev, draggingNode)
+ let nodeList = dropNode.childNodes.map((item, index) => {
+ return {
+ id: item.data.id,
+ parentId: dropNode.data.id,
+ treeIndex: index
+ }
+ })
+ GraphApi.dragModelType(nodeList).then((res) => {
+ if (res.code == 0 || res.code == 200) {
+ ElMessage.success('拖拽成功')
+ getModelList()
+ }
+ })
}
const handleDrop = (draggingNode: Node, dropNode: Node, dropType: NodeDropType, ev: DragEvents) => {
console.log('tree drop:', dropNode.label, dropType)
@@ -370,7 +405,7 @@ const allowDrag = (draggingNode: Node) => {
//拖拽结束
//---------------------查看缩略图--------------------
-var showImageRow:any = null
+var showImageRow: any = null
const showImage = (row: any) => {
showImageRow = row
eventBus.emit('imagePopDialog', row)
@@ -414,8 +449,10 @@ const toggleExpand = (row: any) => {
if (row.expanded) {
row.collapse()
+ updateExpandedState()
} else {
row.expand()
+ updateExpandedState()
// getModelListByType(row.data.id)
}
} else {
@@ -423,6 +460,7 @@ const toggleExpand = (row: any) => {
}
getModelListByType(row.data.id)
currentTypeId.value = row.id
+ leftClickTreeNode = row.data
// loadModelsByType(row.id)
contextMenu.visible && (contextMenu.visible = false)
}
@@ -472,6 +510,7 @@ const handleMenuCommand = (command: string) => {
const handleTypeClick = (row: any) => {
getModelListByType(row.id)
currentTypeId.value = row.$treeNodeId
+ leftClickTreeNode = row
// // 模拟根据类型ID加载模型数据
// loadModelsByType(row.id)
// contextMenu.visible && (contextMenu.visible = false)
@@ -520,7 +559,7 @@ const handleRenameType = (row: TypeNode) => {
}
const handleDeleteType = (row: TypeNode) => {
- ElMessageBox.confirm('是否删除数据?', '警告', {
+ ElMessageBox.confirm('是否删除数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -637,7 +676,7 @@ const getNamefromPath = (path) => {
}
const handleDelete = (row: any) => {
- ElMessageBox.confirm('是否删除数据?', '警告', {
+ ElMessageBox.confirm('是否删除数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -828,3 +867,30 @@ onMounted(() => {
letter-spacing: 1px;
}
+
diff --git a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
index ec57aa0..5a5f4d5 100644
--- a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
@@ -34,9 +34,11 @@
:allow-drop="allowDrop"
:allow-drag="allowDrag"
:data="typeTreeData"
+ :default-expanded-keys="expandedKeys"
draggable
ref="treeRef"
node-key="id"
+ empty-text=""
@node-click="handleTypeClick"
@node-contextmenu="handleContextMenu"
@node-drag-start="handleDragStart"
@@ -83,7 +85,7 @@
@@ -137,7 +139,7 @@