v3.2.4

Author: muyao1987

package.json

@@ -23,7 +23,7 @@
     "kml-geojson": "^1.2.0",
     "localforage": "^1.10.0",
     "mapv": "^2.0.62",
-    "mars3d": "^3.2.2",
+    "mars3d": "^3.2.4",
     "mars3d-cesium": "^1.90.2",
     "mars3d-echarts": "^3.2.2",
     "mars3d-heatmap": "^3.2.2",

src/components/mars-ui/base.less

@@ -252,3 +252,12 @@
 .ant-input-number-handler-wrap {
   background-color: @form-input-background !important;
 }
+
+//table表格滚动条
+.ant-table-body {
+  &::-webkit-scrollbar {
+    //整体样式
+    height: 0;
+    width: 0;
+  }
+}

src/widgets/basic/location-point/index.vue

@@ -16,28 +16,30 @@
         <!-- 十进制的面板 -->
         <div v-show="formState.radioFanwei === '1'">
           <a-form-item label="经度">
-            <mars-input v-model:value="formState.lng" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.lng" class="lnglat-input" @change="changeJWD"> </mars-input>
           </a-form-item>
           <a-form-item label="纬度">
-            <mars-input v-model:value="formState.lat" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.lat" class="lnglat-input" @change="changeJWD"> </mars-input>
           </a-form-item>
           <a-form-item label="高程">
-            <mars-input v-model:value="formState.alt" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.alt" class="lnglat-input" @change="changeJWD"> </mars-input>
           </a-form-item>
         </div>
 
         <!-- 度分秒的面板 -->
         <div v-show="formState.radioFanwei === '2'">
           <a-form-item label="经度">
             <a-space>
-              <mars-input v-model:value="formState.jdDegree"> </mars-input>° <mars-input v-model:value="formState.jdMinute"> </mars-input>'
-              <mars-input v-model:value="formState.jdSecond"> </mars-input>"
+              <mars-input v-model:value="formState.jdDegree" @change="changeDMS"> </mars-input>°
+              <mars-input v-model:value="formState.jdMinute" @change="changeDMS"> </mars-input>'
+              <mars-input v-model:value="formState.jdSecond" @change="changeDMS"> </mars-input>"
             </a-space>
           </a-form-item>
           <a-form-item label="纬度">
             <a-space>
-              <mars-input v-model:value="formState.wdDegree"> </mars-input>° <mars-input v-model:value="formState.wdMinute"> </mars-input>'
-              <mars-input v-model:value="formState.wdSecond"> </mars-input>"
+              <mars-input v-model:value="formState.wdDegree" @change="changeDMS"> </mars-input>°
+              <mars-input v-model:value="formState.wdMinute" @change="changeDMS"> </mars-input>'
+              <mars-input v-model:value="formState.wdSecond" @change="changeDMS"> </mars-input>"
             </a-space>
           </a-form-item>
           <a-form-item label="高程">
@@ -54,13 +56,13 @@
             </a-radio-group>
           </a-form-item>
           <a-form-item label="纵坐标">
-            <mars-input v-model:value="formState.gk6X" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.gk6X" class="lnglat-input" @change="changeGKZone"> </mars-input>
           </a-form-item>
           <a-form-item label="横坐标">
-            <mars-input v-model:value="formState.gk6Y" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.gk6Y" class="lnglat-input" @change="changeGKZone"> </mars-input>
           </a-form-item>
           <a-form-item label="高度值">
-            <mars-input v-model:value="formState.alt" class="lnglat-input"> </mars-input>
+            <mars-input v-model:value="formState.alt" class="lnglat-input" @change="changeGKZone"> </mars-input>
           </a-form-item>
         </div>
       </a-form>
@@ -131,6 +133,21 @@ mapWork.eventTarget.on("loadOK", function (event: any) {
   formState.alt = mapWork.marsUtilFormtNum(currGD, 6)
 })
 
+const changeJWD = () => {
+  currJD = Number(formState.lng)
+  currWD = Number(formState.lat)
+}
+const changeDMS = () => {
+  currJD = mapWork.marsDms2degree(formState.jdDegree, formState.jdMinute, formState.jdSecond)
+  currWD = mapWork.marsDms2degree(formState.wdDegree, formState.wdMinute, formState.wdSecond)
+}
+
+const changeGKZone = () => {
+  const zoon = mapWork.marsZONEtoCRS(Number(formState.gk6X), Number(formState.gk6Y), formState.radioFendai)
+  currJD = zoon[0]
+  currWD = zoon[1]
+}
+
 const changeFanwei = () => {
   switch (formState.radioFanwei) {
     case "2": // 度分秒
@@ -205,7 +222,7 @@ const submitCenter = () => {
     return
   }
 
-  mapWork.updateMarker(true, formState.lng, formState.lat, formState.alt)
+  mapWork.updateMarker(true, currJD, currWD, currGD)
 }
 </script>
 <style lang="less" scoped>

src/widgets/basic/location-point/map.ts

@@ -47,6 +47,18 @@ export function marsProj4Trans(JD: number, WD: number, radio: string) {
   }
 }
 
+// 转换成十进制的方法
+export function marsDms2degree(du: number, fen: number, miao: number) {
+  return mars3d.PointTrans.dms2degree(du, fen, miao)
+}
+export function marsZONEtoCRS(jd: number, wd: number, radio: string) {
+  if (radio === "2") {
+    return mars3d.PointTrans.proj4Trans([jd, wd], mars3d.CRS.CGCS2000_GK_Zone_6, mars3d.CRS.EPSG4326)
+  } else {
+    return mars3d.PointTrans.proj4Trans([jd, wd], mars3d.CRS.CGCS2000_GK_Zone_3, mars3d.CRS.EPSG4326)
+  }
+}
+
 // 地图选点
 export function bindMourseClick() {
   map.setCursor("crosshair")
@@ -59,7 +71,6 @@ export function bindMourseClick() {
   })
 }
 
-
 let pointEntity: any
 export function updateMarker(hasCenter: boolean, jd: number, wd: number, alt: number) {
   const position = [jd, wd, alt]

src/widgets/basic/manage-basemap/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <mars-dialog title="底图" :width="380" :position="{ bottom: 'auto', top: 10, left: 50 }">
+  <mars-dialog title="底图" :width="380" :position="{ top: 50, right: 10 }">
     <ul class="basemap">
       <li v-for="(item, i) in baseMaps" :key="i" class="basemap-card" :class="{ 'active-card': active === item.uuid }" @click="changeBaseMaps(item)">
         <div><img class="icon" :src="`${item.options.icon || 'img/basemaps/bingAerial.png'}`" /></div>