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

src/components/base/assets/scss/components/_loading.scss

@@ -1,39 +1,48 @@
 .ui-loading {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+    position        : absolute;
+    display         : flex;
+    align-items     : center;
+    justify-content : center;
+    left            : 0;
+    top             : 0;
+    width           : 100%;
+    height          : 100%;
+    overflow        : hidden;
     background-color: rgba($color: #000000, $alpha: 0.3);
-    --width: 15px;
-    --color: #fff;
+    --width         : 15px;
+    --color         : #fff;
 }
+
 .ui-loading__box {
-    position: relative;
-    width: 100px;
-    height: 100px;
-    display: flex;
-    align-items: center;
+    position       : relative;
+    width          : 100px;
+    height         : 100px;
+    display        : flex;
+    align-items    : center;
     justify-content: center;
+
+    img {
+        width: 100%;
+    }
+
     .default {
         div {
-            width: var(--width);
-            height: var(--width);
-            background: var(--color);
+            width        : var(--width);
+            height       : var(--width);
+            background   : var(--color);
             border-radius: 50%;
-            display: inline-block;
-            margin-left: calc(var(--width) * 0.6);
+            display      : inline-block;
+            margin-left  : calc(var(--width) * 0.6);
         }
+
         div:nth-child(1) {
             animation: ui-loading-default 1s -0.5s linear infinite;
         }
+
         div:nth-child(2) {
             animation: ui-loading-default 1s -0.25s linear infinite;
         }
+
         div:nth-child(3) {
             animation: ui-loading-default 1s 0s linear infinite;
         }
@@ -43,14 +52,16 @@
 @keyframes ui-loading-default {
     0% {
         transform: scale(1);
-        opacity: 1;
+        opacity  : 1;
     }
+
     50% {
         transform: scale(0.5);
-        opacity: 0.5;
+        opacity  : 0.5;
     }
+
     100% {
         transform: scale(1);
-        opacity: 0.8;
+        opacity  : 0.8;
     }
-}
+}

src/components/base/components/loading/Loading.vue

@@ -5,11 +5,12 @@
       :style="{ zIndex, ['--width']: size + 'px', ['--color']: color }"
     >
       <div class="ui-loading__box">
-        <div class="default">
+        <img src="./_4.gif" />
+        <!-- <div class="default">
           <div></div>
           <div></div>
           <div></div>
-        </div>
+        </div> -->
       </div>
     </div>
   </teleport>

src/graphic/CanvasStyle/default.js

@@ -84,8 +84,7 @@ const Point = {
 const NormalPoint = {
   ...Point,
   fillStyle: "#fff",
-
-}
+};
 
 const RoadPoint = {
   ...Point,
@@ -239,6 +238,9 @@ export default {
   TestPoint,
   RoadPoint,
   GuidePositionLine,
+  ExtendedPositionLine: GuidePositionLine,
+  GuideLocationLine: GuidePositionLine,
+
   SingleArrowLine,
   DoubleArrowLine,
   BasePoint,

src/views/roads/tabulation.vue

@@ -10,7 +10,7 @@
       <div class="content" ref="layoutRef">
         <table>
           <tr>
-            <td class="value title" colspan="6" height="62">
+            <td class="value title" colspan="6" height="46">
               <span v-if="downMode">{{ roadPhoto.title }}</span>
               <ui-input
                 v-else
@@ -22,7 +22,7 @@
             </td>
           </tr>
           <tr>
-            <td class="label" width="150" height="50">到达事故现场时间</td>
+            <td class="label" width="150" height="42">到达事故现场时间</td>
             <td class="value">
               <span v-if="downMode">{{ history.value.arrivalTime }}</span>
               <ui-input
@@ -70,7 +70,7 @@
             </td>
           </tr>
           <tr>
-            <td class="image" colspan="6" height="676">
+            <td class="image" colspan="6" height="569">
               <div class="photo-layout">
                 <img
                   :src="useStaticUrl(roadPhoto.url).value"
@@ -90,7 +90,7 @@
             </td>
           </tr>
           <tr>
-            <td class="value textarea-layout" colspan="6" height="73">
+            <td class="value textarea-layout" colspan="6" height="62">
               <span v-if="downMode">{{ history.value.illustrate }}</span>
               <ui-input
                 class="textarea"
@@ -104,7 +104,7 @@
             </td>
           </tr>
           <tr>
-            <td class="value date" colspan="6" height="50">
+            <td class="value date" colspan="6" height="44">
               {{ formatDate(new Date(), "yyyy年MM月dd日hh时mm分") }}
             </td>
           </tr>
@@ -334,12 +334,12 @@ const saveHandler = async () => {
 .downMode {
   .title {
     span {
-      height: 62px !important;
-      font-size: 54px !important;
+      height: 52px !important;
+      font-size: 46px !important;
       font-family: SimSun-Regular, SimSun;
       font-weight: 400;
       color: #000000;
-      line-height: 63px;
+      line-height: 52px;
       letter-spacing: 13px;
     }
   }
@@ -347,8 +347,8 @@ const saveHandler = async () => {
   .content {
     width: 1485px;
     height: 1050px;
-    // padding: 125px 100px 75px 100px;
-    padding: 30px 28px 26px;
+    padding: 125px 100px 75px 100px;
+    // padding: 30px 28px 26px;
     overflow: hidden;
   }
   .content table .textarea-layout {

src/views/scene/menus/actions.ts

@@ -7,12 +7,13 @@ import {
 import { list, MeasureAtom, MeasureType } from "@/store/measure";
 import { baseLines } from "@/store/baseLine";
 import { basePoints } from "@/store/basePoint";
-import { Ref, watch } from "vue";
+import { nextTick, Ref, watch } from "vue";
 import {
   activeBasePointStack,
   activeFixPointStack,
   customMap,
   useConfirm,
+  useSDK,
 } from "@/hook";
 import { getCoverPos } from "../linkage/cover";
 import { Pos3D } from "@/sdk";
@@ -149,7 +150,12 @@ const menuActions = {
     return trackMeasureMenuAction(
       "L_LINE",
       menu,
-      (data) => list.value.push(data),
+      (data) => {
+        list.value.push(data);
+        nextTick(() => {
+          useSDK().carry.measureMap.get(data).selected(true);
+        });
+      },
       onComplete,
       "测量线"
     );
@@ -158,7 +164,12 @@ const menuActions = {
     return trackMeasureMenuAction(
       "V_LINE",
       menu,
-      (data) => list.value.push(data),
+      (data) => {
+        list.value.push(data);
+        nextTick(() => {
+          useSDK().carry.measureMap.get(data).selected(true);
+        });
+      },
       onComplete,
       "测量线"
     );
@@ -167,7 +178,12 @@ const menuActions = {
     return trackMeasureMenuAction(
       "LINE",
       menu,
-      (data) => list.value.push(data),
+      (data) => {
+        list.value.push(data);
+        nextTick(() => {
+          useSDK().carry.measureMap.get(data).selected(true);
+        });
+      },
       onComplete,
       "测量线"
     );