Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

src/lang/zh/measure.ts

@@ -1,21 +1,21 @@
 export default {
-    "name": "测量",
-    "unit": {
-        "meter": "公制（米）",
-        "inch": "英制（ft）"
-    },
-    "len": "长度",
-    "area": "面积",
-    "toolTip": "取消选中测量工具可以切换点位。",
-    "invalidPoint": "点云为空，无法测量",
-    "start": "开始测量",
-    "stop": "停止测量",
-    "titlePlac": "点击添加备注",
-    "export": "导出测量",
-    "exportPDF": "导出PDF",
-    "downloadName": "测量结果",
-    "copy": "链接复制成功",
-    "pageMark": "{length}页中的第{index}页",
-    "wxError": "微信浏览器无法导出pdf",
-    "unSave": "测量结果未保存，无法生成分享链接"
-}
+  name: "测量",
+  unit: {
+    meter: "公制（米）",
+    inch: "英制（ft）",
+  },
+  len: "长度",
+  area: "面积",
+  toolTip: "取消选中测量工具可以切换点位。",
+  invalidPoint: "点云为空，换个位置试试",
+  start: "开始测量",
+  stop: "停止测量",
+  titlePlac: "点击添加备注",
+  export: "导出测量",
+  exportPDF: "导出PDF",
+  downloadName: "测量结果",
+  copy: "链接复制成功",
+  pageMark: "{length}页中的第{index}页",
+  wxError: "微信浏览器无法导出pdf",
+  unSave: "测量结果未保存，无法生成分享链接",
+};

src/views/scene/container.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="canvas-layout">
-    <p v-if="currentMeterPerPixel" class="meterPerPixel">1: {{ currentMeterPerPixel }}</p>
+    <p v-if="currentMeterPerPixel && viewStatus" class="meterPerPixel">1: {{ currentMeterPerPixel }}</p>
     <div class="scene-canvas" ref="sceneLayoutRef" />
   </div>
 </template>
@@ -18,7 +18,12 @@ import { sceneSeting } from "@/store/sceneSeting";
 const emit = defineEmits<{ (e: "loaded"): void }>();
 const sceneLayoutRef = ref<HTMLCanvasElement>();
 const active = ref(true);
-
+const props = defineProps({
+  viewStatus: {
+    type: Boolean,
+    default: false,
+  },
+});
 onActivated(() => (active.value = true));
 onDeactivated(() => (active.value = false));
 
@@ -48,9 +53,7 @@ onMounted(async () => {
   emit("loaded");
 
   sdk.scene.on("posChange", (pos) => {
-    currentMeterPerPixel.value = pos.meterPerPixel
-      ? Math.round(1 / pos.meterPerPixel)
-      : null;
+    currentMeterPerPixel.value = pos.meterPerPixel ? Math.round(1 / pos.meterPerPixel) : null;
   });
 
   if (!sceneSeting.value) {
@@ -74,9 +77,7 @@ onMounted(async () => {
   // 90
   setTimeout(() => {
     watchEffect(() => {
-      const doms = Array.from(
-        sceneLayoutRef.value.querySelectorAll("#navCube, #home")
-      ) as HTMLElement[];
+      const doms = Array.from(sceneLayoutRef.value.querySelectorAll("#navCube, #home")) as HTMLElement[];
       if (!disabledMap.mode) {
         if (customMap.mode === Mode.pano) {
           doms.forEach((dom) => {

src/views/scene/index.vue

@@ -12,7 +12,7 @@
     <div class="info-layout" ref="layoutRef">
       <div class="info-top">
         <div class="info-top-left" :class="{ full: viewStatus }">
-          <Container @loaded="loaded = true" />
+          <Container @loaded="loaded = true" :viewStatus="viewStatus" />
           <template v-if="loaded && !trackMode">
             <Menus v-if="viewStatus" @active="(data) => (activeMenuKeys = data)" @enter-child="childPage = true" @leave-child="childPage = false" />
             <!-- v-if="currentView" -->

src/views/scene/linkage/measure.ts

@@ -1,22 +1,24 @@
-import {useSDK} from "@/hook";
-import {MeasureAtom, MeasureType, TemploraryID, unTemp} from "@/store";
-import {Measure, MeasureUnit, StartMeasure} from "@/sdk";
-import {Message} from "@/components/base";
-
+import { useSDK } from "@/hook";
+import { MeasureAtom, MeasureType, TemploraryID, unTemp } from "@/store";
+import { Measure, MeasureUnit, StartMeasure } from "@/sdk";
+import { Message } from "@/components/base";
 
 type CanvasMeasureAtom = { raw: MeasureAtom; canvas: Measure };
 type TempCanvasMeasureAtom = Omit<CanvasMeasureAtom, "canvas"> & {
   canvas: StartMeasure;
 };
 
-export type SuccessMeasureAtom = MeasureAtom & {length: number}
-
-let prevMeasure: TempCanvasMeasureAtom
+export type SuccessMeasureAtom = MeasureAtom & { length: number };
 
+let prevMeasure: TempCanvasMeasureAtom;
 
-export const startMeasure = (type: MeasureType, color: string, firstClickMarker?: () => void) => {
+export const startMeasure = (
+  type: MeasureType,
+  color: string,
+  firstClickMarker?: () => void
+) => {
   if (prevMeasure) {
-    prevMeasure.canvas.bus.emit("quit")
+    prevMeasure.canvas.bus.emit("quit");
     prevMeasure = null;
   }
 
@@ -39,42 +41,44 @@ export const startMeasure = (type: MeasureType, color: string, firstClickMarker?
     canvas: measure,
   };
 
-  return new Promise<typeof raw>(resolve => {
+  return new Promise<typeof raw>((resolve) => {
     const endHandler = () => {
       raw.points = currentMeasure.canvas.getPoints();
-      raw.length = currentMeasure.canvas.getDistance().value
+      raw.length = currentMeasure.canvas.getDistance().value;
       raw.dataset_points = currentMeasure.canvas.getDatasetLocations();
       raw.datasetIds = currentMeasure.canvas.getDatasets();
       raw.dataSet = unTemp;
       endMeasure();
       resolve(raw);
-    }
+    };
     const quitHandler = () => {
       currentMeasure.canvas.quit();
-      endMeasure()
+      endMeasure();
       resolve(null);
-    }
-    const invalidPointHandler = (msg = '点云为空，无法测量') => {
+    };
+    const invalidPointHandler = (msg = "点云为空，换个位置试试") => {
       Message.warning(msg);
-    }
+    };
     const endMeasure = () => {
       currentMeasure.canvas.clear();
       currentMeasure.canvas.bus.off("end", endHandler);
       currentMeasure.canvas.bus.off("quit", quitHandler);
       currentMeasure.canvas.bus.off("invalidPoint", invalidPointHandler);
-      firstClickMarker && currentMeasure.canvas.bus.off("firstClickMarker", firstClickMarker)
+      firstClickMarker &&
+        currentMeasure.canvas.bus.off("firstClickMarker", firstClickMarker);
       if (prevMeasure === currentMeasure) {
         prevMeasure = null;
       }
-    }
+    };
 
     currentMeasure.canvas.bus.on("quit", quitHandler);
     currentMeasure.canvas.bus.on("end", endHandler);
     currentMeasure.canvas.bus.on("invalidPoint", invalidPointHandler);
-    firstClickMarker && currentMeasure.canvas.bus.on("firstClickMarker", firstClickMarker)
-    prevMeasure = currentMeasure
-  })
-}
+    firstClickMarker &&
+      currentMeasure.canvas.bus.on("firstClickMarker", firstClickMarker);
+    prevMeasure = currentMeasure;
+  });
+};
 
 export const continuedMeasure = (
   type: MeasureType,
@@ -82,19 +86,17 @@ export const continuedMeasure = (
   onAddMeasure: (data: MeasureAtom) => void,
   firstClickMarker?: () => void
 ) => {
-
-  startMeasure(type, color, firstClickMarker)
-    .then(data => {
-      if (data) {
-        onAddMeasure(data);
-        continuedMeasure(type, color, onAddMeasure, firstClickMarker)
-      }
-    })
-}
+  startMeasure(type, color, firstClickMarker).then((data) => {
+    if (data) {
+      onAddMeasure(data);
+      continuedMeasure(type, color, onAddMeasure, firstClickMarker);
+    }
+  });
+};
 
 export const stopMeasure = () => {
   if (prevMeasure) {
-    prevMeasure.canvas.bus.emit("quit")
+    prevMeasure.canvas.bus.emit("quit");
     prevMeasure = null;
   }
-}
+};

src/views/tables/explorate-four.vue

@@ -143,14 +143,14 @@
             <span>现场勘查人员签名：</span>
             <div>
               <input type="text" v-model="data.explorateSign" />
-              <div class="content-box left">{{ data.clientSign }}</div>
+              <div class="content-box left">{{ data.explorateSign }}</div>
             </div>
           </div>
           <div>
             <span>记录人签名：</span>
             <div>
               <input type="text" v-model="data.reportSign" />
-              <div class="content-box left">{{ data.clientSign }}</div>
+              <div class="content-box left">{{ data.reportSign }}</div>
             </div>
           </div>
         </div>

src/views/tables/explorate-one.vue

@@ -136,12 +136,14 @@
                         <span>经度:</span>
                         <div class="input-box">
                           <input type="text" v-model="data.longitude" />
+                          <div class="content-box left">{{ data.longitude }}</div>
                         </div>
                       </div>
                       <div class="latitude">
                         <span>纬度:</span>
                         <div>
                           <input type="text" v-model="data.latitude" />
+                          <div class="content-box left">{{ data.latitude }}</div>
                         </div>
                       </div>
                     </div>
@@ -150,6 +152,7 @@
                     <div class="pos-item-name" style="height: 54px">地点描述</div>
                     <div class="pos-msg desc input-box" style="height: 54px">
                       <input type="text" v-model="data.addressDesc" />
+                      <div class="content-box left">{{ data.addressDesc }}</div>
                     </div>
                   </div>
                 </div>