bill 1 年間 前
コミット
504ee7f204

+ 4 - 3
src/components/point-input.vue

@@ -19,6 +19,7 @@
         <el-input
           v-model.trim="ivalue.name"
           :maxlength="100"
+          rows="4"
           show-word-limit
           placeholder="请输入"
           type="textarea"
@@ -64,8 +65,8 @@ const typeOptions = [
 ];
 
 const coordInfo = computed(
-  () => `纬度:${toDegrees(ivalue.value.pos[0])}″
-经度:${toDegrees(ivalue.value.pos[1])}″
+  () => `经度:${toDegrees(ivalue.value.pos[1])}
+纬度:${toDegrees(ivalue.value.pos[0])}
 高程:${ivalue.value.pos[2]}`
 );
 
@@ -88,7 +89,7 @@ watch(
 
 const submit = async () => {
   if (ivalue.value.name.trim().length === 0) {
-    return ElMessage.error(`点位名称不能为空!`);
+    return ElMessage.error(`测点说明不能为空!`);
   }
   await props.updateValue(ivalue.value);
   emit("update:visible", false);

+ 1 - 1
src/view/map/coord.vue

@@ -117,7 +117,7 @@
       </div>
     </div>
 
-    <template v-if="!queryMode">
+    <template v-if="!queryMode && treeNode.length">
       <el-button
         type="primary"
         :icon="Download"

+ 13 - 11
src/view/map/layout.vue

@@ -51,19 +51,13 @@
             </el-select>
           </div>
         </div>
-        <div class="map-bottom-out-pano" v-if="!isCoordPage">
+        <div class="map-bottom-out-pano">
           <div class="point-info">
-            <div>
-              <el-icon size="20" color="rgb(230, 162, 60)">
+            <div v-for="type in typeOptions">
+              <el-icon size="20" :color="pointColorMap[type]">
                 <locationIcon />
               </el-icon>
-              <p>RTK点位</p>
-            </div>
-            <div>
-              <el-icon size="20" color="rgba(64, 158, 255)">
-                <locationIcon />
-              </el-icon>
-              <p>地图选点</p>
+              <p>{{ type }}</p>
             </div>
           </div>
         </div>
@@ -95,10 +89,18 @@ import {
 import { computed, ref, watch } from "vue";
 import { initSelfRelics, relics } from "@/store/relics";
 import { queryMode } from "./install";
-import { PoPoint } from "drawing-board";
+import { PointTypeEnum, pointColorMap, PoPoint } from "drawing-board";
 import { boardData, scenePoints } from "@/store/scene";
 import saveAs from "@/util/file-serve";
 
+const typeOptions = [
+  PointTypeEnum.border,
+  PointTypeEnum.center,
+  PointTypeEnum.marker,
+  PointTypeEnum.other,
+  PointTypeEnum.mapSelect,
+];
+
 const menus = [
   {
     icon: locationIcon,

+ 3 - 2
src/view/map/pc4Helper.ts

@@ -10,6 +10,7 @@ import {
   downloadPointsXLSL2,
 } from "@/util/pc4xlsl";
 import { noValidPoint } from "./install";
+import { PointTypeEnum } from "@/lib/board/4dmap";
 
 export const exportFile = async (
   points: ScenePoint[],
@@ -35,7 +36,7 @@ export const exportFile = async (
       points.map((point) => ({
         title: point.name,
         desc: point.remark || "无",
-        type: point.type,
+        type: point.type || PointTypeEnum.other,
       })),
       name + "绘制矢量数据"
     );
@@ -45,7 +46,7 @@ export const exportFile = async (
       points.map((point) => ({
         title: point.name,
         desc: point.remark || "无",
-        type: point.type,
+        type: point.type || PointTypeEnum.other,
       })),
       name + "本体边界坐标",
       version