Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue

@@ -192,6 +192,7 @@ const closeDialog = () => {
   modelType.value = ''
   dialogVisible.value = false
 }
+//@ts-ignore
 const addType = () => {
   if (!modelType.value) {
     return ElMessage.warning('请输入军标类型名称')
@@ -369,7 +370,7 @@ const allowDrag = (draggingNode: Node) => {
 //拖拽结束
 
 //---------------------查看缩略图--------------------
-var showImageRow = null
+var showImageRow:any = null
 const showImage = (row: any) => {
   showImageRow = row
   eventBus.emit('imagePopDialog', row)
@@ -468,7 +469,7 @@ const handleMenuCommand = (command: string) => {
   }
 }
 
-const handleTypeClick = (row: TypeNode) => {
+const handleTypeClick = (row: any) => {
   getModelListByType(row.id)
   currentTypeId.value = row.$treeNodeId
   // // 模拟根据类型ID加载模型数据
@@ -635,7 +636,7 @@ const getNamefromPath = (path) => {
   return name
 }
 
-const handleDelete = (row: ModelItem) => {
+const handleDelete = (row: any) => {
   ElMessageBox.confirm('是否删除数据?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue

@@ -478,7 +478,7 @@ const handleMenuCommand = (command: string) => {
   }
 }
 
-const handleTypeClick = (row: TypeNode) => {
+const handleTypeClick = (row: any) => {
   getModelListByType(row.id)
   currentTypeId.value = row.$treeNodeId
   // // 模拟根据类型ID加载模型数据

src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue

@@ -245,6 +245,7 @@ const closeDialog = () => {
   modelType.value = ''
   dialogVisible.value = false
 }
+//@ts-ignore
 const addType = () => {
   if (!modelType.value) {
     return ElMessage.warning('请输入图标类型名称')
@@ -449,7 +450,7 @@ const allowDrag = (draggingNode: Node) => {
 //拖拽结束
 
 //---------------------查看缩略图--------------------
-var showImageRow = null
+var showImageRow:any = null
 const showImage = (row: any) => {
   showImageRow = row
   eventBus.emit('imagePopDialog', row)
@@ -562,8 +563,8 @@ const handleMenuCommand = (command: string) => {
   }
 }
 
-var clickTreeNode = null
-const handleTypeClick = (row: TypeNode) => {
+var clickTreeNode:any = null
+const handleTypeClick = (row: any) => {
   getModelListByType(row.id)
   currentTypeId.value = row.$treeNodeId
   clickTreeNode = row
@@ -614,7 +615,7 @@ const handleRenameType = (row: TypeNode) => {
   dialogVisible.value = true
 }
 
-var clickPhotoRow = null
+var clickPhotoRow:any = null
 const editPhotoName = (row) => {
   dialogTitle.value = '图标重命名'
   modelType.value = row.iconName
@@ -739,7 +740,7 @@ const getNamefromPath = (path) => {
   return name
 }
 
-const handleDelete = (row: ModelItem) => {
+const handleDelete = (row: any) => {
   ElMessageBox.confirm('是否删除数据?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -758,8 +759,8 @@ const handleDelete = (row: ModelItem) => {
     .catch(() => {})
 }
 //立体图标、普通图标
-let threePhoto = []
-let ordinaryPhoto = []
+let threePhoto:any = []
+let ordinaryPhoto:any = []
 
 const setPhotoList = () => {
   $sendElectronChanel('requireGEMarkerName', {

src/renderer/src/views/components/propertyBox/graph.vue

@@ -129,7 +129,7 @@ interface Category {
 }
 
 // 模拟数据
-const categories = ref<Category[]>([])
+const categories = ref<any>([])
 
 const activeTab = ref('0')
 const galleryRef = ref<HTMLElement>()
@@ -243,7 +243,7 @@ const toggleExpand = (row: any) => {
   // loadModelsByType(row.id)
 }
 
-const handleTypeClick = (row: TypeNode) => {
+const handleTypeClick = (row: any) => {
   getModelListByType(row.id)
   currentTypeId.value = row.$treeNodeId
 }
@@ -308,7 +308,7 @@ const renderModel = async (model) => {
         cusUpdateNode({ id: params.id, sourceName: params.name, params: JSON.stringify(params) })
       })
 
-      let DbOption = {
+      let DbOption:any = {
         params: option,
         id,
         sourceName: model.militaryName,
@@ -399,6 +399,7 @@ const close = () => {
 }
 const setting = () => {
   isShowPup.value = false
+  // @ts-ignore
   eventBus.emit('openGraphSetting', (true, isSetting))
 }
 

src/renderer/src/views/components/propertyBox/model.vue

@@ -243,7 +243,7 @@ const toggleExpand = (row: any) => {
 }
 const addType = ref('')
 
-const handleTypeClick = (row: TypeNode) => {
+const handleTypeClick = (row: any) => {
   getModelListByType(row.id)
   currentTypeId.value = row.$treeNodeId
 }