制作1.2需求

src/components/point-input.vue

@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    :model-value="visible"
+    @update:model-value="(val) => emit('update:visible', val)"
+    title="测点信息"
+    width="500"
+  >
+    <el-form label-width="auto">
+      <el-form-item label="坐标" v-if="ivalue.pos">
+        <el-input :value="coordInfo" readonly type="textarea" rows="3" disabled />
+      </el-form-item>
+
+      <el-form-item label="测点类型" required>
+        <el-select v-model="ivalue.type" placeholder="测点类型">
+          <el-option :label="type" :value="type" v-for="type in typeOptions" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="测点说明" required>
+        <el-input
+          v-model.trim="ivalue.name"
+          :maxlength="100"
+          show-word-limit
+          placeholder="请输入"
+          type="textarea"
+        />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input
+          v-model.trim="ivalue.remark"
+          :maxlength="100"
+          show-word-limit
+          placeholder="请输入"
+        />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="emit('update:visible', false)">取消</el-button>
+        <el-button type="primary" @click="submit"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ElMessage } from "element-plus";
+import { ref, watchEffect, computed, watch } from "vue";
+import { ScenePoint } from "@/store/scene";
+import { PointTypeEnum } from "drawing-board";
+import { toDegrees } from "@/util";
+
+const props = defineProps<{
+  visible: boolean;
+  value: ScenePoint;
+  updateValue: (value: ScenePoint) => void;
+}>();
+
+const typeOptions = [
+  PointTypeEnum.border,
+  PointTypeEnum.center,
+  PointTypeEnum.marker,
+  PointTypeEnum.other,
+];
+
+const coordInfo = computed(
+  () => `纬度：${toDegrees(ivalue.value.pos[0])}″
+经度：${toDegrees(ivalue.value.pos[1])}″
+高程：${ivalue.value.pos[2]}`
+);
+
+const emit = defineEmits<{
+  (e: "update:visible", visible: boolean): void;
+}>();
+
+const ivalue = ref<ScenePoint>();
+watchEffect(() => {
+  ivalue.value = { ...props.value };
+});
+
+watch(
+  () => props.value?.type,
+  (type) => {
+    ivalue.value.type = type || PointTypeEnum.other;
+  },
+  { immediate: true }
+);
+
+const submit = async () => {
+  if (ivalue.value.name.trim().length === 0) {
+    return ElMessage.error(`点位名称不能为空！`);
+  }
+  await props.updateValue(ivalue.value);
+  emit("update:visible", false);
+};
+</script>

src/request/drawing.ts

@@ -1,40 +1,29 @@
-import { sendFetch, PageProps } from './index'
+import { PolygonsAttrib } from "drawing-board";
+import { sendFetch, PageProps } from "./index";
 import * as URL from "./URL";
-import {
 
-    PolygonsAttrib,
-} from "./type";
-
-// 
+//
 export type PolyDataType = {
-    id: string
-    lineIds: string[]
-    name?: string
-
-}
-
-export interface DrawingDataType extends PolygonsAttrib {
-    id?: string;
-    polygons: PolyDataType[],
-}
+  id: string;
+  lineIds: string[];
+  name?: string;
+};
 
 export type DrawingParamsType = {
-    data: DrawingDataType,
-    relicsId: string
-    drawingId?: string
-}
+  data: PolygonsAttrib;
+  relicsId: string;
+  drawingId?: string;
+};
 
 export const addOrUpdateDrawingFetch = (params: Partial<DrawingParamsType>) =>
-    sendFetch<PageProps<DrawingDataType>>(URL.addOrUpdateDrawing, {
-        method: "post",
-        body: JSON.stringify(params),
-    });
-
-
+  sendFetch<PageProps<PolygonsAttrib>>(URL.addOrUpdateDrawing, {
+    method: "post",
+    body: JSON.stringify(params),
+  });
 
 export const getDrawingDetailFetch = (drawingId: string) =>
-    sendFetch<PageProps<DrawingParamsType>>(
-        URL.getDrawingInfoByRelicsId,
-        { method: "post", body: JSON.stringify({}) },
-        { paths: { drawingId: drawingId } }
-    );
+  sendFetch<PageProps<DrawingParamsType>>(
+    URL.getDrawingInfoByRelicsId,
+    { method: "post", body: JSON.stringify({}) },
+    { paths: { drawingId: drawingId } }
+  );

src/request/index.ts

@@ -19,11 +19,17 @@ import {
   Device,
   // PolygonsAttrib,
 } from "./type";
+import { PointTypeEnum } from "drawing-board";
 // import { getFdTokenByNum } from "./URL";
 
 const error = throttle((msg: string) => ElMessage.error(msg), 2000);
 
-type Other = { params?: Param; paths?: Param; useResult?: boolean, noToken?: boolean };
+type Other = {
+  params?: Param;
+  paths?: Param;
+  useResult?: boolean;
+  noToken?: boolean;
+};
 export const sendFetch = <T>(
   url: string,
   init: RequestInit,
@@ -42,7 +48,7 @@ export const sendFetch = <T>(
         sendUrl + "?" + new URLSearchParams({ ...gParams, ...other.params });
     }
     if (other.noToken) {
-      delete gHeaders['relics-token']
+      delete gHeaders["relics-token"];
     }
   }
   lifeHook.forEach(({ start }) => start());
@@ -51,9 +57,9 @@ export const sendFetch = <T>(
     ...init,
     headers: headers
       ? {
-        ...headers,
-        ...gHeaders,
-      }
+          ...headers,
+          ...gHeaders,
+        }
       : gHeaders,
   })
     .then((res) => {
@@ -67,7 +73,7 @@ export const sendFetch = <T>(
     })
     .then((data) => {
       if (other && other.useResult) {
-        return data
+        return data;
       } else {
         if (data.code !== 0) {
           error(data.message);
@@ -92,12 +98,11 @@ export const loginFetch = (props: LoginProps) =>
     body: JSON.stringify(props),
   });
 
-  export const loginOutFetch = () =>
-    sendFetch<{ user: UserInfo; token: string }>(URL.logout, {
-      method: "post",
-      body: JSON.stringify({}),
-    });
-  
+export const loginOutFetch = () =>
+  sendFetch<{ user: UserInfo; token: string }>(URL.logout, {
+    method: "post",
+    body: JSON.stringify({}),
+  });
 
 export const userInfoFetch = () =>
   sendFetch<UserInfo>(URL.getUserInfo, { method: "post" });
@@ -187,10 +192,16 @@ export const delRelicsScenesFetch = (
     { method: "post", body: JSON.stringify(scenes) },
     { paths: { relicsId } }
   );
-export const updateRelicsScenePosNameFetch = (posId: number, name: string) =>
+
+export const updateRelicsScenePosNameFetch = (point: ScenePoint) =>
   sendFetch(URL.updateRelicsScenePosName, {
     method: "post",
-    body: JSON.stringify({ id: posId, name }),
+    body: JSON.stringify({
+      id: point.id,
+      name: point.name,
+      type: point.type,
+      remark: point.remark,
+    }),
   });
 
 export const relicsScenePosInfoFetch = (posId: number) =>

src/request/type.ts

@@ -1,11 +1,8 @@
 import { DeviceType } from "@/store/device";
-import {
-  relicsLevelDesc,
-  relicsTypeDesc,
-  creationMethodDesc,
-} from "@/store/relics";
+import { relicsLevelDesc, relicsTypeDesc, creationMethodDesc } from "@/store/relics";
 import { SceneStatus } from "@/store/scene";
 import {
+  PointTypeEnum,
   WholeLineLineAttrib,
   WholeLinePointAttrib,
   WholeLinePolygonAttrib,
@@ -53,6 +50,7 @@ export type ResResult = {
   timestamp: string;
 };
 export type ScenePoint = {
+  type: PointTypeEnum;
   tbStatus: number;
   createTime: string;
   updateTime: string;
@@ -61,6 +59,7 @@ export type ScenePoint = {
   id: number;
   uuid: number;
   name: string;
+  remark: string;
   pos: [number, number, number] | [];
   location: [number, number, number];
   centerLocation: [number, number, number];
@@ -154,15 +153,3 @@ export type Device = {
   userId: 2;
   userName: string;
 };
-
-export type PolygonsPointAttrib = WholeLinePointAttrib & {
-  rtk: boolean;
-  title: string;
-};
-export type PolygonsLineAttrib = WholeLineLineAttrib;
-
-export type PolygonsAttrib = {
-  lines: PolygonsLineAttrib[];
-  polygons: WholeLinePolygonAttrib[];
-  points: PolygonsPointAttrib[];
-};

src/store/polygons.ts

@@ -1,16 +1,11 @@
-import {
-  WholeLineLineAttrib,
-  WholeLinePointAttrib,
-  WholeLinePolygonAttrib,
-} from "drawing-board";
+import { PolygonsAttrib } from "drawing-board";
 import { ref } from "vue";
 
-export type Polygons = {
-  id: string;
-  lines: WholeLineLineAttrib[];
-  polygons: WholeLinePolygonAttrib[];
-  points: (WholeLinePointAttrib & { rtk: boolean })[];
-};
+export type Polygons = PolygonsAttrib;
+export type {
+  PolygonsLineAttrib as LineAttrib,
+  PolygonsPointAttrib as PontAttrib,
+} from "drawing-board";
 
 export const polygons = ref<Polygons>({
   id: "0",

src/store/scene.ts

@@ -9,6 +9,7 @@ import {
   PolygonsPointAttrib,
   getWholeLineLinesByPointId,
   PolygonsAttrib,
+  PointTypeEnum,
 } from "drawing-board";
 import { getDrawingDetailFetch } from "@/request/drawing";
 
@@ -105,11 +106,8 @@ export const refreshScenes = async () => {
   await refreshBoardData();
 };
 
-export const updateScenePointName = async (
-  point: ScenePoint,
-  newName: string
-) => {
-  await updateRelicsScenePosNameFetch(point.id, newName);
+export const updateScenePointName = async (point: ScenePoint) => {
+  await updateRelicsScenePosNameFetch(point);
   relicsId.value && (await refreshScenes());
 };
 
@@ -188,6 +186,7 @@ const scenePosTransform = (scenes: Scene[]) => {
       points.push({
         x: pos.pos[0],
         y: pos.pos[1],
+        type: pos.type,
         title: pos.index
           ? pos.index + (pos.name ? "-" + pos.name : "")
           : pos.name,

src/util/pc4xlsl.ts

@@ -54,36 +54,35 @@ export const downloadPointsXLSL1 = async (
 
 export const downloadPointsXLSL2 = async (
   points: number[][],
-  desc: { title: string; desc: string }[] = [],
-  name: string
+  desc: { title: string; desc: string; type: string }[] = [],
+  name: string,
+  version: string
 ) => {
   const tabs = points.map((point, i) => {
-    const des = desc[i] || { title: "无", desc: "无" };
+    const des = desc[i] || {
+      title: "无",
+      desc: "无",
+      type: "其他",
+      remark: "无",
+    };
     return {
       latitude: toDegrees(point[1], 4),
       longitude: toDegrees(point[0], 4),
       altitude: round(point[2], 4),
       description: des.title,
       remark: des.desc,
+      type: des.type,
     };
   });
 
-  const data = await fetch(basePath + URL.exportCoordinateData, {
-    headers: gHeaders,
-    method: "post",
-    body: JSON.stringify(tabs),
-  }).then((res) => res.blob());
+  const data = await fetch(
+    basePath + URL.exportCoordinateData + "/" + version,
+    {
+      headers: gHeaders,
+      method: "post",
+      body: JSON.stringify(tabs),
+    }
+  ).then((res) => res.blob());
 
   return saveAs(data, `${name}.xls`);
 };
-
-export const downloadPointsXLSL = async (
-  points: number[][],
-  desc: { title: string; desc: string }[] = [],
-  name: string
-) => {
-  downloadPointsXLSL1(points, desc, name);
-  downloadPointsXLSL2(points, desc, name + "本体边界坐标");
-};
-
-

src/view/map/coord.vue

@@ -65,7 +65,14 @@
                     {{ node.label }}
                   </span>
                   <span :class="{ disable: data.disable }" class="name">
-                    {{ data.raw.name }}
+                    <span
+                      class="color"
+                      :style="{
+                        backgroundColor:
+                          pointColorMap[data.raw.type || PointTypeEnum.other],
+                      }"
+                    ></span>
+                    {{ data.raw.name }} &nbsp;
                   </span>
                 </div>
               </el-tooltip>
@@ -115,9 +122,17 @@
         type="primary"
         :icon="Download"
         style="width: 100%"
-        @click="exportFile(getSelectPoints(), 2, relics?.name)"
+        @click="exportFile(getSelectPoints(), 2, relics?.name, 'V2')"
       >
-        导出本体边界坐标
+        导出本体边界坐标（V1.4模板）
+      </el-button>
+      <el-button
+        type="primary"
+        :icon="Download"
+        style="width: 100%; margin-top: 20px; margin-left: 0"
+        @click="exportFile(getSelectPoints(), 2, relics?.name, 'V1')"
+      >
+        导出本体边界坐标（V1.2模板）
       </el-button>
 
       <el-button
@@ -127,20 +142,16 @@
         @click="exportImage(getSelectPoints(), relics?.name)"
       >
         下载全景图
-        {{ inputPoint?.name }}
       </el-button>
     </template>
   </div>
 
   <SingleInput
-    :key="inputPoint?.id"
+    v-if="inputPoint"
     :visible="!!inputPoint"
     @update:visible="inputPoint = null"
-    :value="inputPoint?.name || ''"
+    :value="inputPoint"
     :update-value="updatePointName"
-    is-allow-empty
-    title="测点说明"
-    placeholder="请填写测点说明"
   />
 </template>
 
@@ -167,7 +178,7 @@ import {
   scenePoints,
 } from "@/store/scene";
 import { relics } from "@/store/relics";
-import SingleInput from "@/components/single-input.vue";
+import SingleInput from "@/components/point-input.vue";
 import { selectScenes } from "../quisk";
 import { addRelicsScenesFetch, delRelicsScenesFetch } from "@/request";
 import { exportFile, exportImage } from "./pc4Helper";
@@ -181,25 +192,29 @@ import {
   PolygonsPointAttrib,
   getWholeLineLinesByPointId,
   getWholeLinePoint,
+  pointColorMap,
+  PointTypeEnum,
 } from "drawing-board";
 import { flyScene, gotoPointPage, mapManage } from "./install";
 import { board } from "./install";
 
 const inputPoint = ref<ScenePoint | null>(null);
-const updatePointName = async (title: string) => {
+const updatePointName = async (scenePoint: ScenePoint) => {
   const point = getWholeLinePoint(
     boardData.value,
     inputPoint.value.id.toString()
   ) as PolygonsPointAttrib;
+
   await Promise.all([
     boardDataChange(() => {
       if (point) {
-        point.title = inputPoint.value.index
-          ? inputPoint.value.index + "-" + title
-          : title;
+        point.title = scenePoint.index
+          ? scenePoint.index + "-" + scenePoint.name
+          : scenePoint.name;
+        point.type = scenePoint.type;
       }
     }),
-    updateScenePointName(inputPoint.value!, title),
+    updateScenePointName(scenePoint),
   ]);
 };
 
@@ -382,6 +397,14 @@ onBeforeUnmount(() => {
       text-overflow: ellipsis; //文本溢出显示省略号
       overflow: hidden;
       white-space: nowrap; //文本不会换行
+
+      .color {
+        display: inline-block;
+        width: 8px;
+        height: 8px;
+        margin-right: 8px;
+        border-radius: 4px;
+      }
     }
   }
 

src/view/map/install.ts

@@ -67,7 +67,6 @@ watch(
   boardData,
   (data, oldData) => {
     data && board.setData(data);
-    console.log(data, data === oldData);
   },
   {
     immediate: true,

src/view/map/pc4Helper.ts

@@ -4,17 +4,14 @@ import saveAs from "@/util/file-serve";
 import { openLoading, closeLoading } from "@/helper/loading";
 import { dateFormat } from "@/util";
 import { ElMessage } from "element-plus";
-import {
-  downloadPointsXLSL,
-  downloadPointsXLSL1,
-  downloadPointsXLSL2,
-} from "@/util/pc4xlsl";
+import { downloadPointsXLSL1, downloadPointsXLSL2 } from "@/util/pc4xlsl";
 import { noValidPoint } from "./install";
 
 export const exportFile = async (
   points: ScenePoint[],
   type: number,
-  name: string = ""
+  name: string = "",
+  version = "v1"
 ) => {
   if (!points.length) {
     ElMessage.error("请选择要导出的点位");
@@ -31,21 +28,30 @@ export const exportFile = async (
   if (type === 1) {
     await downloadPointsXLSL1(
       points.map((point) => point.pos),
-      points.map((point) => ({ title: point.name, desc: point.name })),
+      points.map((point) => ({
+        title: point.name,
+        desc: point.remark || "无",
+        type: point.type,
+      })),
       name + "绘制矢量数据"
     );
   } else if (type === 2) {
     await downloadPointsXLSL2(
       points.map((point) => point.pos),
-      points.map((point) => ({ title: point.name, desc: "无" })),
-      name + "本体边界坐标"
+      points.map((point) => ({
+        title: point.name,
+        desc: point.remark || "无",
+        type: point.type,
+      })),
+      name + "本体边界坐标",
+      version
     );
   } else {
-    await downloadPointsXLSL(
-      points.map((point) => point.pos),
-      points.map((point) => ({ title: point.name, desc: point.name })),
-      "test"
-    );
+    // await downloadPointsXLSL(
+    //   points.map((point) => point.pos),
+    //   points.map((point) => ({ title: point.name, desc: point.name })),
+    //   "test"
+    // );
   }
   ElMessage.success("文件导出成功");
 };

src/view/pano/pano.vue

@@ -32,17 +32,14 @@
   <SingleInput
     v-if="point"
     :visible="update"
-    isAllowEmpty
     @update:visible="update = false"
-    :value="point.name || ''"
-    :update-value="tex => updateScenePointName(point!, tex)"
-    title="测点说明"
-    placeholder="请填写测点说明"
+    :value="point"
+    :update-value="(npoint) => updateScenePointName(npoint)"
   />
 </template>
 
 <script setup lang="ts">
-import SingleInput from "@/components/single-input.vue";
+import SingleInput from "@/components/point-input.vue";
 import { router, setDocTitle } from "@/router";
 import { mergeFuns, round } from "@/util";
 import { computed, onMounted, onUnmounted, ref, watchEffect } from "vue";

tsconfig.json

@@ -27,8 +27,8 @@
         "src/*"
       ],
       "drawing-board": [
-        "./src/lib/board/4dmap.d.ts"
-        // "../drawing-board/src/app/4dmap/index.ts"
+        // "./src/lib/board/4dmap.d.ts"
+        "../drawing-board/src/app/4dmap/index.ts"
       ]
     }
   },

vite.config.ts

@@ -16,11 +16,11 @@ export default ({ mode }: any) =>
         },
         {
           find: "drawing-board",
-          replacement: resolve(__dirname, "./src/lib/board/4dmap.js"),
-          // replacement: resolve(
-          //   __dirname,
-          //   "../drawing-board/src/app/4dmap/index.ts"
-          // ),
+          // replacement: resolve(__dirname, "./src/lib/board/4dmap.js"),
+          replacement: resolve(
+            __dirname,
+            "../drawing-board/src/app/4dmap/index.ts"
+          ),
         },
       ],
     },