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

.gitignore

@@ -2,6 +2,8 @@ node_modules
 dist
 build
 out
+resources
+ffplay
 .history
 .DS_Store
 .vscode

resources/java/app/license/yjearth.YJ

@@ -1 +0,0 @@
-41b/ujShRZRf9Aa433FD3uyIZuxWSSqXWXlc2dyQfJ75ED0HNbadcdsPF5CaMuJ624E+iLBfS14muki3Kp1qv3N0KPVdc0TjJDyrO+AVfwE3xW3RZy00SBFwUgG/tIU6bBTw4XijzGn57R1nl7djDeP1sx04fzNeWSLujfPS4hzwLryTr1ScTPGegLiv1C+rXsbkAxFf47uMIGGK0M2VBZTA9+UoajQ1PHwDUdI7Sfo2JRzkCFW8v6WI1jCNPaFyLypkZtybW+yeNEhnp/jeYw==

resources/java/app/license/yjearth.lic

@@ -1 +0,0 @@
-41b/ujShRZRf9Aa433FD3uyIZuxWSSqXWXlc2dyQfJ75ED0HNbadcdsPF5CaMuJ624E+iLBfS14muki3Kp1qv3N0KPVdc0TjJDyrO+AVfwE3xW3RZy00SBFwUgG/tIU6bBTw4XijzGn57R1nl7djDeP1sx04fzNeWSLujfPS4hzwLryTr1ScTPGegLiv1C+rXsbkAxFf47uMIGGK0M2VBZTA9+UoajQ1PHwDUdI7Sfo2JRzkCFW8v6WI1jCNPaFyLypkZtybW+yeNEhnp/jeYw==1

resources/java/app/license/yjearth.yj

@@ -1 +0,0 @@
-41b/ujShRZRf9Aa433FD3uyIZuxWSSqXWXlc2dyQfJ75ED0HNbadcdsPF5CaMuJ624E+iLBfS14muki3Kp1qv3N0KPVdc0TjJDyrO+AVfwE3xW3RZy00SBFwUgG/tIU6bBTw4XijzGn57R1nl7djDeP1sx04fzNeWSLujfPS4hzwLryTr1ScTPGegLiv1C+rXsbkAxFf47uMIGGK0M2VBZTA9+UoajQ1PHwDUdI7Sfo2JRzkCFW8v6WI1jCNPaFyLypkZtybW+yeNEhnp/jeYw==

src/renderer/src/api/photo/index.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import request from '@/axios/request'
 //图标库
 export const PhotoApi = {
@@ -44,7 +45,7 @@ export const PhotoApi = {
     })
   },
   //图标类型列表
-  modelTypeList: async (data: any) => {
+  modelTypeList: async (data?: any) => {
     return await request.get({
       url: `/iconLibrary/iconTypeTree`,
       params: data,

src/renderer/src/views/TS/deduction.vue

@@ -84,6 +84,7 @@
 </template>
 
 <script setup lang="ts">
+// @ts-nocheck
 import {ZoomIn, ZoomOut, VideoPlay, VideoPause, RefreshLeft} from '@element-plus/icons-vue'
 
 import EventParams from "./components/eventParams.vue"
@@ -106,7 +107,7 @@ if (instance) {
 // 注册拖拽指令
 // 1. 创建ref引用，绑定到el-popover组件
 // const multiplierPopover = ref<InstanceType<typeof ElPopover> | null>(null);
-const multiplierPopover = ref(null);
+const multiplierPopover: any = ref(null);
 // 控制 popover 显示/隐藏的核心变量（替代实例方法）
 const isPopoverShow = ref(false);
 let multipliers = [16, 8, 4, 2, 1, 0.5, 0.25]

src/renderer/src/views/TS/list.vue

@@ -156,6 +156,7 @@ import {ElMessage, ElMessageBox, TableV2SortOrder} from 'element-plus'
 import type {SortBy} from 'element-plus'
 import {TsApi} from "../../api/ts";
 import NewPlan from "./newPlan.vue"
+const moment = require("moment");
 
 const date = ref({
   ymd: '',

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

@@ -209,7 +209,7 @@ const routeImport = () => {
     filters: [
       {
         name: '路网', //、底图
-        extensions: ['pbf']
+        extensions: ['pbf', 'pbfl']
       }
     ]
   }

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

@@ -437,7 +437,7 @@ const handleDragEnd = (
   console.log('tree drag end:', dropNode, dropType, ev, draggingNode)
 
   if (dropType != 'none') {
-    let nodeList = []
+    let nodeList:any = []
     switch (dropType) {
       case 'before':
       case 'after':
@@ -507,6 +507,7 @@ const showImage = (row: any) => {
 const handleContextMenu = (event: MouseEvent, row: TypeNode) => {
   event.stopPropagation()
   event.preventDefault()
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left
@@ -579,6 +580,7 @@ const getModelListByType = (id) => {
 }
 const divContextMenu = (event: MouseEvent) => {
   event.preventDefault()
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left
@@ -701,7 +703,7 @@ const getBase64Image = (src) => {
         let blob = this.response
         let oFileReader = new FileReader()
         oFileReader.onloadend = function (e) {
-          const base64 = e.target.result
+          const base64 = e?.target?.result
           resolve(base64)
         }
         oFileReader.readAsDataURL(blob)

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

@@ -223,7 +223,7 @@ const contextMenu = reactive({
 
 const treeRef = ref()
 //表头拖拽
-const tableRef = ref(null)
+const tableRef:any = ref(null)
 
 const handleHeaderDragend = (newWidth, oldWidth, column, event) => {
   const columns = tableRef.value.$refs.tableHeaderRef.columnRows[0]
@@ -486,7 +486,7 @@ const handleDragEnd = (
 ) => {
   console.log('tree drag end:', dropNode, dropType, ev, draggingNode, draggingNode.parent)
   if (dropType != 'none') {
-    let nodeList = []
+    let nodeList:any = []
     switch (dropType) {
       case 'before':
       case 'after':
@@ -584,6 +584,7 @@ const handleContextMenu = (event: MouseEvent, row: TypeNode) => {
   event.preventDefault()
   contextMenu.currentRow = row
   // 计算相对于文档的坐标
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left
@@ -649,6 +650,7 @@ const getModelListByType = (id) => {
 }
 const divContextMenu = (event: MouseEvent) => {
   event.preventDefault()
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left

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

@@ -517,7 +517,7 @@ const handleDragEnd = (
 ) => {
   console.log('tree drag end:', dropNode, dropType, ev, draggingNode)
   if (dropType != 'none') {
-    let nodeList = []
+    let nodeList:any = []
     switch (dropType) {
       case 'before':
       case 'after':
@@ -591,6 +591,7 @@ const handleContextMenu = (event: MouseEvent, row: TypeNode) => {
   }
 
   contextMenu.currentRow = row
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left
@@ -671,6 +672,7 @@ const divContextMenu = (event: MouseEvent) => {
     return
   }
   event.preventDefault()
+  // @ts-expect-error
   if (document.getElementsByClassName('settingPop')[0]?.style.transform.length) {
     let rect = document.getElementsByClassName('settingPop')[0].getBoundingClientRect()
     contextMenu.x = event.clientX - rect.left

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

@@ -141,7 +141,6 @@ const activeName = ref('authorize')
 const isShowPup = ref(false)
 const open = (data) => {
   isShowPup.value = true
-  console.log(data, 'kkkkkkkk')
   if (data !== 'current') {
     //如果不是传curent打开就回到第一个tab
     activeName.value = 'authorize'
@@ -159,7 +158,6 @@ const changeTab = (x, j) => {
     default:
       break
   }
-  console.log(x, j, 'activeName.value')
 }
 const close = () => {
   isShowPup.value = false

src/renderer/src/views/components/headers/components/setTool/setTool.vue

@@ -13,10 +13,18 @@
         </div>
       </div>
     </div> -->
-    <el-tooltip v-for="(item, i) of setList" :key="item.id" :content="t('iconTitle.' + item.name)" effect="customized"
-      :hide-after="0">
-      <div class="set_item" :class="{ 'last-item': i === setList.length - 1, 'first-item': i === 0 }"
-        @click="item.callback">
+    <el-tooltip
+      v-for="(item, i) of setList"
+      :key="item.id"
+      :content="t('iconTitle.' + item.name)"
+      effect="customized"
+      :hide-after="0"
+    >
+      <div
+        class="set_item"
+        :class="{ 'last-item': i === setList.length - 1, 'first-item': i === 0 }"
+        @click="item.callback"
+      >
         <svg-icon :name="item.icon" :size="20"></svg-icon>
       </div>
     </el-tooltip>
@@ -65,8 +73,10 @@ const logout = async (e) => {
         // localStorage.clear()
       }
     })
-    .catch(() => {
-    })
+    .catch(() => {})
+}
+const openSet = () => {
+  setPupRef.value?.open()
 }
 
 const fullScreen = (item) => {
@@ -96,7 +106,8 @@ const setList = ref([
     name: 'set',
     className: 'header_public',
     dbcallback: null,
-    callback: setShow
+    // callback: setShow
+    callback: openSet
   },
   {
     id: 2,
@@ -126,7 +137,7 @@ const setList = ref([
     callback: (e) => {}
     //   dbcallback: this.flyTo,
     //   callback: this.locate,
-  },
+  }
 ])
 
 ipcRenderer.invoke('getIsFullScreen').then((res) => {
@@ -171,10 +182,12 @@ ipcRenderer.on('fullscreen-status-changed', (event, isFullscreen) => {
     top: 0;
     bottom: 0;
     width: 1px;
-    background: linear-gradient(180deg,
+    background: linear-gradient(
+      180deg,
       rgba(var(--color-base1), 0),
       rgba(var(--color-base1), 1),
-        rgba(204, 204, 204, 0));
+      rgba(204, 204, 204, 0)
+    );
   }
 
   .set_item.first-item::after {

src/renderer/src/views/components/leftSide/leftSideSecond.vue

@@ -687,7 +687,6 @@ const methodMap = {
       })
       dom?.classList.remove('default-cursor')
       dom?.classList.add('custom-cursor')
-      console.log(document.getElementsByClassName('custom-cursor')[0].style, 'llllll')
     } else {
       dom?.classList.remove('custom-cursor')
       dom?.classList.add('default-cursor')

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

@@ -179,6 +179,7 @@
 </template>
 
 <script setup lang="ts">
+//@ts-nocheck
 import { useI18n } from 'vue-i18n'
 import { Search } from '@element-plus/icons-vue'
 import { ref, onMounted, onBeforeUnmount, watch } from 'vue'