合并

src/renderer/components.d.ts

@@ -25,7 +25,6 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     Index_b: typeof import('./src/components/SvgIcon/index_b.vue')['default']
     Pagination: typeof import('./src/components/Pagination/index.vue')['default']

src/renderer/src/views/components/bottomSide/bottomSide.vue

@@ -234,8 +234,8 @@ const bottomMenuList = ref([
           "params": options
         }
         console.log(params)
-        eventBus.emit("openDialog", 'circle');
+        // eventBus.emit("openDialog", 'circle');
-        // TreeApi.addOtherSource(params)
+        TreeApi.addOtherSource(params)
       })
     }
   },

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

@@ -39,8 +39,8 @@ import { bus } from '@/utils/bus'
 import leftSideSecond from '@/views/components/leftSide/leftSideSecond.vue'
 
 const { t } = useI18n()
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
-const menuList = ref([
+const menuList: any = ref([
   // 方案推演
   {
     name: 'situation',

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

@@ -69,8 +69,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 const viewPointHeight: any = ref(1.8)
 const precision: any = ref(20)
 
@@ -92,7 +92,7 @@ const viewPointHeightChange = () => {
   visibility.viewPointHeights = viewPointHeight.value
 }
 const viewPointHeightInput = () => {
-  let dom = document.getElementById('viewPointHeight')
+  let dom: any = document.getElementById('viewPointHeight')
   if (viewPointHeight.value < dom.min * 1) {
     viewPointHeight.value = dom.min * 1
   } else if (viewPointHeight.value > dom.max * 1) {

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

@@ -155,8 +155,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 eventBus.on('contourDialog', () => {
   baseDialog.value?.open()

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

@@ -117,8 +117,8 @@ import { ref, reactive } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 const activeName = ref('first')
 
@@ -135,6 +135,7 @@ eventBus.on('coorLocationDialog', () => {
   baseDialog.value?.open()
 })
 
+// @ts-ignore (define in dts)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
   longitude.value = null
@@ -160,9 +161,13 @@ const flyto = (e) => {
       })
       break
     case 'second':
+      // @ts-ignore (define in dts)
       var lng = Math.abs(longitude.value) + Math.abs(lngMin.value) / 60
+      // @ts-ignore (define in dts)
       var lat = Math.abs(latitude.value) + Math.abs(latMin.value) / 60
+      // @ts-ignore (define in dts)
       lng = longitude.value < 0 ? -lng : lng
+      // @ts-ignore (define in dts)
       lat = latitude.value < 0 ? -lat : lat
 
       var position = { lng, lat, alt: 100 }
@@ -172,11 +177,15 @@ const flyto = (e) => {
       break
     case 'third':
       var lng =
+      // @ts-ignore (define in dts)
         Math.abs(longitude.value) + Math.abs(lngMin.value) / 60 + Math.abs(lngSec.value) / 3600
       var lat =
+      // @ts-ignore (define in dts)
         Math.abs(latitude.value) + Math.abs(latMin.value) / 60 + Math.abs(latSec.value) / 3600
 
+        // @ts-ignore (define in dts)
       lng = longitude.value < 0 ? -lng : lng
+      // @ts-ignore (define in dts)
       lat = latitude.value < 0 ? -lat : lat
 
       var position = { lng, lat, alt: 100 }

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

@@ -112,8 +112,8 @@ import { ref, reactive } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 var height: any = ref(70)
 var precision: any = ref(125)
@@ -135,7 +135,7 @@ eventBus.on('cutFillDialog', () => {
 })
 
 const heightInput = () => {
-  let dom = document.getElementById('height')
+  let dom: any = document.getElementById('height')
   if (height.value < dom.min * 1) {
     height.value = dom.min * 1
   } else if (height.value > dom.max * 1) {

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

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <Dialog
     ref="baseDialog"
     class="fly-roam"
@@ -121,8 +121,8 @@ import { ref, reactive } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 var show: any = ref(false)
 var flyRoam: any = reactive([])
@@ -154,4 +154,4 @@ const close = (e) => {
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss"></style> -->

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

@@ -48,8 +48,8 @@ import { ref, reactive } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 var width: any = ref(1)
 var graffiti: any = reactive([])
@@ -64,7 +64,7 @@ eventBus.on('graffitiDialog', () => {
 
 const closeCallBack = (e) => {}
 const widthInput = () => {
-  let dom = document.getElementById('width')
+  let dom: any = document.getElementById('width')
   if (width.value < dom.min * 1) {
     width.value = dom.min * 1
   } else if (width.value > dom.max * 1) {

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

@@ -25,8 +25,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 //属性
 var profile: any = reactive([])
 var echartsObject: any = reactive({})
@@ -50,6 +50,7 @@ function close() {
   baseDialog.value?.close()
 }
 const draw = (e) => {
+  // @ts-ignore (define in dts)
   initEcharts()
   profile.reDraw()
 }
@@ -68,12 +69,14 @@ function initEcharts(points) {
         continue
       }
       const curData = [element.distance.toFixed(2), element.position.height.toFixed(2)]
+      // @ts-ignore (define in dts)
       datas.push(curData)
       const curCoords = [element.position.lng, element.position.lat]
+      // @ts-ignore (define in dts)
       coords.push(curCoords)
     }
     const ele = document.getElementsByClassName('profile-echarts')[0]
-    echartsObject = echarts.init(ele)
+    echartsObject = (window as any).echarts.init(ele)
     option = {
       tooltip: {
         trigger: 'axis',
@@ -81,7 +84,7 @@ function initEcharts(points) {
           align: 'left'
         },
         formatter(params) {
-          const xy = coords[params[0].dataIndex]
+          const xy: any = coords[params[0].dataIndex]
           const tipData = params[0]['data']
           profile.formatter(xy, tipData)
           return (
@@ -174,7 +177,7 @@ function initEcharts(points) {
           },
           areaStyle: {
             normal: {
-              color: new echarts.graphic.LinearGradient(
+              color: new (window as any).echarts.graphic.LinearGradient(
                 0,
                 0,
                 0,
@@ -222,7 +225,7 @@ function initEcharts(points) {
     }
   } else {
     const ele = document.getElementsByClassName('profile-echarts')[0]
-    echartsObject = echarts.init(ele)
+    echartsObject = (window as any).echarts.init(ele)
     option = {
       tooltip: {
         trigger: 'axis',
@@ -305,7 +308,7 @@ function initEcharts(points) {
           },
           areaStyle: {
             normal: {
-              color: new echarts.graphic.LinearGradient(
+              color: new (window as any).echarts.graphic.LinearGradient(
                 0,
                 0,
                 0,

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

@@ -29,8 +29,8 @@ import { ref, reactive } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 
 //属性
 var startLng: any = ref(null)

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

@@ -128,8 +128,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 var selectType: any = ref('first')
 var scale: any = ref(1)
 var radio: any = ref('1:500')

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

@@ -184,8 +184,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { inject } from 'vue'
 import Dialog from '@/components/dialog/baseDialog.vue'
 
-const baseDialog = ref(null)
+const baseDialog: any = ref(null)
-const eventBus = inject('bus')
+const eventBus: any = inject('bus')
 // 属性
 var minWaterLevel: any = ref(0)
 var maxWaterLevel: any = ref(0)
@@ -261,7 +261,7 @@ function analog() {
 }
 
 function minWaterLevelInput() {
-  let dom = document.getElementById('minWaterLevel')
+  let dom: any = document.getElementById('minWaterLevel')
   if (minWaterLevel.value != '.') {
     if (minWaterLevel.value < dom.min * 1) {
       minWaterLevel.value = dom.min * 1
@@ -277,7 +277,7 @@ function minWaterLevelInput() {
   }
 }
 function maxWaterLevelInput() {
-  let dom = document.getElementById('maxWaterLevel')
+  let dom: any = document.getElementById('maxWaterLevel')
   if (minWaterLevel.value != '.') {
     if (maxWaterLevel.value < dom.min * 1) {
       maxWaterLevel.value = dom.min * 1
@@ -299,7 +299,7 @@ function maxWaterLevelInput() {
   }
 }
 function areaInput() {
-  let dom = document.getElementById('area')
+  let dom: any = document.getElementById('area')
   if (minWaterLevel.value != '.') {
     if (area.value < dom.min * 1) {
       area.value = dom.min * 1
@@ -315,7 +315,7 @@ function areaInput() {
   }
 }
 function waterVolumeInput() {
-  let dom = document.getElementById('waterVolume')
+  let dom: any = document.getElementById('waterVolume')
   if (waterVolume.value < dom.min * 1) {
     waterVolume.value = dom.min * 1
   } else if (waterVolume.value > dom.max * 1) {
@@ -331,7 +331,7 @@ function waterVolumeInput() {
   }
 }
 function risingSpeedInput() {
-  let dom = document.getElementById('risingSpeed')
+  let dom: any = document.getElementById('risingSpeed')
   if (risingSpeed.value != '.') {
     if (risingSpeed.value < dom.min * 1) {
       risingSpeed.value = dom.min * 1

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

@@ -61,7 +61,7 @@ let originalOptions: any
 let that: any
 const colorRef = ref(null)
 const open = async (id: any) => {
-  id = window.standTextid
+  id = (window as any).standTextid
   that = window.earth.entityMap.get(id)
   originalOptions = structuredClone(that.options)
   entityOptions.value = that

src/renderer/src/views/home/index.vue

@@ -29,10 +29,10 @@
   <Contour ref="Contour"></Contour>
   <RoutePlanning ref="RoutePlanning"></RoutePlanning>
   <Graffiti ref="Graffiti"></Graffiti>
-  <FlyRoam ref="FlyRoam"></FlyRoam>
+  <!-- <FlyRoam ref="FlyRoam"></FlyRoam> -->
   <CoorLocation ref="CoorLocation"></CoorLocation>
   <ScreenShot ref="ScreenShot"></ScreenShot>
-  <TerrainExcavation ref="TerrainExcavation"></TerrainExcavation>
+  <!-- <TerrainExcavation ref="TerrainExcavation"></TerrainExcavation> -->
 </template>
 
 <script setup lang="ts">